Skip to content

Commit 5ced53c

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#87628 from alculquicondor/cc-v1alpha2
Add kubescheduler.config.k8s.io/v1alpha2
2 parents ff536ee + 3d83ef2 commit 5ced53c

File tree

28 files changed

+2171
-8
lines changed

28 files changed

+2171
-8
lines changed

‎api/api-rules/violation_exceptions.list‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -491,9 +491,6 @@ API rule violation: list_type_missing,k8s.io/kube-scheduler/config/v1,Policy,Pri
491491
API rule violation: list_type_missing,k8s.io/kube-scheduler/config/v1,RequestedToCapacityRatioArguments,Resources
492492
API rule violation: list_type_missing,k8s.io/kube-scheduler/config/v1,RequestedToCapacityRatioArguments,Shape
493493
API rule violation: list_type_missing,k8s.io/kube-scheduler/config/v1,ServiceAffinity,Labels
494-
API rule violation: list_type_missing,k8s.io/kube-scheduler/config/v1alpha1,KubeSchedulerConfiguration,PluginConfig
495-
API rule violation: list_type_missing,k8s.io/kube-scheduler/config/v1alpha1,PluginSet,Disabled
496-
API rule violation: list_type_missing,k8s.io/kube-scheduler/config/v1alpha1,PluginSet,Enabled
497494
API rule violation: list_type_missing,k8s.io/kubelet/config/v1beta1,KubeletConfiguration,AllowedUnsafeSysctls
498495
API rule violation: list_type_missing,k8s.io/kubelet/config/v1beta1,KubeletConfiguration,ClusterDNS
499496
API rule violation: list_type_missing,k8s.io/kubelet/config/v1beta1,KubeletConfiguration,EnforceNodeAllocatable

‎build/kazel_generated.bzl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ tags_values_pkgs = {"openapi-gen": {
100100
"staging/src/k8s.io/kube-proxy/config/v1alpha1",
101101
"staging/src/k8s.io/kube-scheduler/config/v1",
102102
"staging/src/k8s.io/kube-scheduler/config/v1alpha1",
103+
"staging/src/k8s.io/kube-scheduler/config/v1alpha2",
103104
"staging/src/k8s.io/kubelet/config/v1beta1",
104105
"staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1",
105106
"staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2",
@@ -187,6 +188,7 @@ tags_pkgs_values = {"openapi-gen": {
187188
"staging/src/k8s.io/kube-proxy/config/v1alpha1": ["true"],
188189
"staging/src/k8s.io/kube-scheduler/config/v1": ["true"],
189190
"staging/src/k8s.io/kube-scheduler/config/v1alpha1": ["true"],
191+
"staging/src/k8s.io/kube-scheduler/config/v1alpha2": ["true"],
190192
"staging/src/k8s.io/kubelet/config/v1beta1": ["true"],
191193
"staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1": ["true"],
192194
"staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2": ["true"],

‎cmd/kube-scheduler/app/options/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ go_library(
1919
"//pkg/scheduler/apis/config:go_default_library",
2020
"//pkg/scheduler/apis/config/scheme:go_default_library",
2121
"//pkg/scheduler/apis/config/v1alpha1:go_default_library",
22+
"//pkg/scheduler/apis/config/v1alpha2:go_default_library",
2223
"//pkg/scheduler/apis/config/validation:go_default_library",
2324
"//staging/src/k8s.io/api/core/v1:go_default_library",
2425
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

‎cmd/kube-scheduler/app/options/configfile.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
2929
kubeschedulerscheme "k8s.io/kubernetes/pkg/scheduler/apis/config/scheme"
3030
kubeschedulerconfigv1alpha1 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1alpha1"
31+
kubeschedulerconfigv1alpha2 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1alpha2"
3132
)
3233

3334
func loadConfigFromFile(file string) (*kubeschedulerconfig.KubeSchedulerConfiguration, error) {
@@ -55,6 +56,7 @@ func loadConfig(data []byte) (*kubeschedulerconfig.KubeSchedulerConfiguration, e
5556
_, lenientCodecs, lenientErr := codec.NewLenientSchemeAndCodecs(
5657
kubeschedulerconfig.AddToScheme,
5758
kubeschedulerconfigv1alpha1.AddToScheme,
59+
kubeschedulerconfigv1alpha2.AddToScheme,
5860
)
5961
if lenientErr != nil {
6062
return nil, lenientErr
@@ -76,7 +78,7 @@ func WriteConfigFile(fileName string, cfg *kubeschedulerconfig.KubeSchedulerConf
7678
return fmt.Errorf("unable to locate encoder -- %q is not a supported media type", mediaType)
7779
}
7880

79-
encoder := kubeschedulerscheme.Codecs.EncoderForVersion(info.Serializer, kubeschedulerconfigv1alpha1.SchemeGroupVersion)
81+
encoder := kubeschedulerscheme.Codecs.EncoderForVersion(info.Serializer, kubeschedulerconfigv1alpha2.SchemeGroupVersion)
8082

8183
configFile, err := os.Create(fileName)
8284
if err != nil {

‎hack/.golint_failures‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ pkg/registry/settings/rest
189189
pkg/registry/storage/rest
190190
pkg/registry/storage/storageclass
191191
pkg/scheduler/apis/config/v1alpha1
192+
pkg/scheduler/apis/config/v1alpha2
192193
pkg/security/podsecuritypolicy
193194
pkg/security/podsecuritypolicy/group
194195
pkg/security/podsecuritypolicy/selinux

‎pkg/scheduler/apis/config/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ filegroup(
3535
"//pkg/scheduler/apis/config/testing:all-srcs",
3636
"//pkg/scheduler/apis/config/v1:all-srcs",
3737
"//pkg/scheduler/apis/config/v1alpha1:all-srcs",
38+
"//pkg/scheduler/apis/config/v1alpha2:all-srcs",
3839
"//pkg/scheduler/apis/config/validation:all-srcs",
3940
],
4041
tags = ["automanaged"],

‎pkg/scheduler/apis/config/scheme/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ go_library(
99
"//pkg/scheduler/apis/config:go_default_library",
1010
"//pkg/scheduler/apis/config/v1:go_default_library",
1111
"//pkg/scheduler/apis/config/v1alpha1:go_default_library",
12+
"//pkg/scheduler/apis/config/v1alpha2:go_default_library",
1213
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
1314
"//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
1415
"//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",

‎pkg/scheduler/apis/config/scheme/scheme.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
2424
kubeschedulerconfigv1 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1"
2525
kubeschedulerconfigv1alpha1 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1alpha1"
26+
kubeschedulerconfigv1alpha2 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1alpha2"
2627
)
2728

2829
var (
@@ -42,5 +43,6 @@ func AddToScheme(scheme *runtime.Scheme) {
4243
utilruntime.Must(kubeschedulerconfig.AddToScheme(Scheme))
4344
utilruntime.Must(kubeschedulerconfigv1.AddToScheme(Scheme))
4445
utilruntime.Must(kubeschedulerconfigv1alpha1.AddToScheme(Scheme))
46+
utilruntime.Must(kubeschedulerconfigv1alpha2.AddToScheme(Scheme))
4547
utilruntime.Must(scheme.SetVersionPriority(kubeschedulerconfigv1alpha1.SchemeGroupVersion))
4648
}

‎pkg/scheduler/apis/config/v1alpha1/conversion.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ package v1alpha1
1919
import (
2020
"fmt"
2121

22-
conversion "k8s.io/apimachinery/pkg/conversion"
23-
v1alpha1 "k8s.io/kube-scheduler/config/v1alpha1"
24-
config "k8s.io/kubernetes/pkg/scheduler/apis/config"
22+
"k8s.io/apimachinery/pkg/conversion"
23+
"k8s.io/kube-scheduler/config/v1alpha1"
24+
"k8s.io/kubernetes/pkg/scheduler/apis/config"
2525
)
2626

2727
// Convert_v1alpha1_KubeSchedulerLeaderElectionConfiguration_To_config_KubeSchedulerLeaderElectionConfiguration is an autogenerated conversion function.

‎pkg/scheduler/apis/config/v1alpha1/defaults.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ import (
2323
"k8s.io/apimachinery/pkg/runtime"
2424
componentbaseconfigv1alpha1 "k8s.io/component-base/config/v1alpha1"
2525
kubeschedulerconfigv1alpha1 "k8s.io/kube-scheduler/config/v1alpha1"
26+
"k8s.io/kubernetes/pkg/scheduler/apis/config"
2627

2728
// this package shouldn't really depend on other k8s.io/kubernetes code
2829
api "k8s.io/kubernetes/pkg/apis/core"
2930
"k8s.io/kubernetes/pkg/master/ports"
30-
"k8s.io/kubernetes/pkg/scheduler/apis/config"
3131
)
3232

3333
func addDefaultingFuncs(scheme *runtime.Scheme) error {

0 commit comments

Comments
 (0)