Skip to content

Commit c682b31

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#91420 from pancernik/scheduler-config-v1beta1
Promote kubescheduler.config.k8s.io to v1betav1
2 parents 74b857c + 852442c commit c682b31

38 files changed

+1191
-1191
lines changed

‎api/api-rules/violation_exceptions.list‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -597,10 +597,10 @@ API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,V
597597
API rule violation: names_match,k8s.io/kube-controller-manager/config/v1alpha1,VolumeConfiguration,PersistentVolumeRecyclerConfiguration
598598
API rule violation: names_match,k8s.io/kube-proxy/config/v1alpha1,KubeProxyConfiguration,IPTables
599599
API rule violation: names_match,k8s.io/kube-scheduler/config/v1,Extender,EnableHTTPS
600-
API rule violation: names_match,k8s.io/kube-scheduler/config/v1alpha2,ResourceSpec,Name
601-
API rule violation: names_match,k8s.io/kube-scheduler/config/v1alpha2,ResourceSpec,Weight
602-
API rule violation: names_match,k8s.io/kube-scheduler/config/v1alpha2,UtilizationShapePoint,Score
603-
API rule violation: names_match,k8s.io/kube-scheduler/config/v1alpha2,UtilizationShapePoint,Utilization
600+
API rule violation: names_match,k8s.io/kube-scheduler/config/v1beta1,ResourceSpec,Name
601+
API rule violation: names_match,k8s.io/kube-scheduler/config/v1beta1,ResourceSpec,Weight
602+
API rule violation: names_match,k8s.io/kube-scheduler/config/v1beta1,UtilizationShapePoint,Score
603+
API rule violation: names_match,k8s.io/kube-scheduler/config/v1beta1,UtilizationShapePoint,Utilization
604604
API rule violation: names_match,k8s.io/kubelet/config/v1beta1,KubeletConfiguration,IPTablesDropBit
605605
API rule violation: names_match,k8s.io/kubelet/config/v1beta1,KubeletConfiguration,IPTablesMasqueradeBit
606606
API rule violation: names_match,k8s.io/kubelet/config/v1beta1,KubeletConfiguration,ResolverConfig

‎build/kazel_generated.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ tags_values_pkgs = {"openapi-gen": {
9999
"staging/src/k8s.io/kube-controller-manager/config/v1alpha1",
100100
"staging/src/k8s.io/kube-proxy/config/v1alpha1",
101101
"staging/src/k8s.io/kube-scheduler/config/v1",
102-
"staging/src/k8s.io/kube-scheduler/config/v1alpha2",
102+
"staging/src/k8s.io/kube-scheduler/config/v1beta1",
103103
"staging/src/k8s.io/kubelet/config/v1beta1",
104104
"staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1",
105105
"staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2",
@@ -185,7 +185,7 @@ tags_pkgs_values = {"openapi-gen": {
185185
"staging/src/k8s.io/kube-controller-manager/config/v1alpha1": ["true"],
186186
"staging/src/k8s.io/kube-proxy/config/v1alpha1": ["true"],
187187
"staging/src/k8s.io/kube-scheduler/config/v1": ["true"],
188-
"staging/src/k8s.io/kube-scheduler/config/v1alpha2": ["true"],
188+
"staging/src/k8s.io/kube-scheduler/config/v1beta1": ["true"],
189189
"staging/src/k8s.io/kubelet/config/v1beta1": ["true"],
190190
"staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta1": ["true"],
191191
"staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2": ["true"],

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ go_library(
1616
"//pkg/scheduler/algorithmprovider:go_default_library",
1717
"//pkg/scheduler/apis/config:go_default_library",
1818
"//pkg/scheduler/apis/config/scheme:go_default_library",
19-
"//pkg/scheduler/apis/config/v1alpha2:go_default_library",
19+
"//pkg/scheduler/apis/config/v1beta1:go_default_library",
2020
"//pkg/scheduler/apis/config/validation:go_default_library",
2121
"//pkg/scheduler/framework/plugins/interpodaffinity:go_default_library",
2222
"//staging/src/k8s.io/api/core/v1:go_default_library",
@@ -40,7 +40,7 @@ go_library(
4040
"//staging/src/k8s.io/component-base/config/options:go_default_library",
4141
"//staging/src/k8s.io/component-base/config/v1alpha1:go_default_library",
4242
"//staging/src/k8s.io/component-base/metrics:go_default_library",
43-
"//staging/src/k8s.io/kube-scheduler/config/v1alpha2:go_default_library",
43+
"//staging/src/k8s.io/kube-scheduler/config/v1beta1:go_default_library",
4444
"//vendor/github.com/spf13/pflag:go_default_library",
4545
"//vendor/k8s.io/klog/v2:go_default_library",
4646
],

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"k8s.io/apimachinery/pkg/runtime"
2525
kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
2626
kubeschedulerscheme "k8s.io/kubernetes/pkg/scheduler/apis/config/scheme"
27-
kubeschedulerconfigv1alpha2 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1alpha2"
27+
kubeschedulerconfigv1beta1 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta1"
2828
)
2929

3030
func loadConfigFromFile(file string) (*kubeschedulerconfig.KubeSchedulerConfiguration, error) {
@@ -56,7 +56,7 @@ func WriteConfigFile(fileName string, cfg *kubeschedulerconfig.KubeSchedulerConf
5656
return fmt.Errorf("unable to locate encoder -- %q is not a supported media type", mediaType)
5757
}
5858

59-
encoder := kubeschedulerscheme.Codecs.EncoderForVersion(info.Serializer, kubeschedulerconfigv1alpha2.SchemeGroupVersion)
59+
encoder := kubeschedulerscheme.Codecs.EncoderForVersion(info.Serializer, kubeschedulerconfigv1beta1.SchemeGroupVersion)
6060

6161
configFile, err := os.Create(fileName)
6262
if err != nil {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import (
4343
configv1alpha1 "k8s.io/component-base/config/v1alpha1"
4444
"k8s.io/component-base/metrics"
4545
"k8s.io/klog/v2"
46-
kubeschedulerconfigv1alpha2 "k8s.io/kube-scheduler/config/v1alpha2"
46+
kubeschedulerconfigv1beta1 "k8s.io/kube-scheduler/config/v1beta1"
4747
schedulerappconfig "k8s.io/kubernetes/cmd/kube-scheduler/app/config"
4848
"k8s.io/kubernetes/pkg/scheduler"
4949
kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
@@ -134,7 +134,7 @@ func splitHostIntPort(s string) (string, int, error) {
134134
}
135135

136136
func newDefaultComponentConfig() (*kubeschedulerconfig.KubeSchedulerConfiguration, error) {
137-
versionedCfg := kubeschedulerconfigv1alpha2.KubeSchedulerConfiguration{}
137+
versionedCfg := kubeschedulerconfigv1beta1.KubeSchedulerConfiguration{}
138138
versionedCfg.DebuggingConfiguration = *configv1alpha1.NewRecommendedDebuggingConfiguration()
139139

140140
kubeschedulerscheme.Scheme.Default(&versionedCfg)

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func TestSchedulerOptions(t *testing.T) {
7373
configFile := filepath.Join(tmpDir, "scheduler.yaml")
7474
configKubeconfig := filepath.Join(tmpDir, "config.kubeconfig")
7575
if err := ioutil.WriteFile(configFile, []byte(fmt.Sprintf(`
76-
apiVersion: kubescheduler.config.k8s.io/v1alpha2
76+
apiVersion: kubescheduler.config.k8s.io/v1beta1
7777
kind: KubeSchedulerConfiguration
7878
clientConnection:
7979
kubeconfig: "%s"
@@ -137,7 +137,7 @@ leaderElection:
137137

138138
unknownFieldConfig := filepath.Join(tmpDir, "scheduler_invalid_unknown_field.yaml")
139139
if err := ioutil.WriteFile(unknownFieldConfig, []byte(fmt.Sprintf(`
140-
apiVersion: kubescheduler.config.k8s.io/v1alpha2
140+
apiVersion: kubescheduler.config.k8s.io/v1beta1
141141
kind: KubeSchedulerConfiguration
142142
clientConnection:
143143
kubeconfig: "%s"
@@ -149,7 +149,7 @@ foo: bar`, configKubeconfig)), os.FileMode(0600)); err != nil {
149149

150150
duplicateFieldConfig := filepath.Join(tmpDir, "scheduler_invalid_duplicate_fields.yaml")
151151
if err := ioutil.WriteFile(duplicateFieldConfig, []byte(fmt.Sprintf(`
152-
apiVersion: kubescheduler.config.k8s.io/v1alpha2
152+
apiVersion: kubescheduler.config.k8s.io/v1beta1
153153
kind: KubeSchedulerConfiguration
154154
clientConnection:
155155
kubeconfig: "%s"
@@ -186,7 +186,7 @@ users:
186186
// plugin config
187187
pluginConfigFile := filepath.Join(tmpDir, "plugin.yaml")
188188
if err := ioutil.WriteFile(pluginConfigFile, []byte(fmt.Sprintf(`
189-
apiVersion: kubescheduler.config.k8s.io/v1alpha2
189+
apiVersion: kubescheduler.config.k8s.io/v1beta1
190190
kind: KubeSchedulerConfiguration
191191
clientConnection:
192192
kubeconfig: "%s"
@@ -217,7 +217,7 @@ profiles:
217217
// multiple profiles config
218218
multiProfilesConfig := filepath.Join(tmpDir, "multi-profiles.yaml")
219219
if err := ioutil.WriteFile(multiProfilesConfig, []byte(fmt.Sprintf(`
220-
apiVersion: kubescheduler.config.k8s.io/v1alpha2
220+
apiVersion: kubescheduler.config.k8s.io/v1beta1
221221
kind: KubeSchedulerConfiguration
222222
clientConnection:
223223
kubeconfig: "%s"

‎cmd/kube-scheduler/app/server_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ users:
7373
// plugin config
7474
pluginConfigFile := filepath.Join(tmpDir, "plugin.yaml")
7575
if err := ioutil.WriteFile(pluginConfigFile, []byte(fmt.Sprintf(`
76-
apiVersion: kubescheduler.config.k8s.io/v1alpha2
76+
apiVersion: kubescheduler.config.k8s.io/v1beta1
7777
kind: KubeSchedulerConfiguration
7878
clientConnection:
7979
kubeconfig: "%s"
@@ -110,7 +110,7 @@ profiles:
110110
// multiple profiles config
111111
multiProfilesConfig := filepath.Join(tmpDir, "multi-profiles.yaml")
112112
if err := ioutil.WriteFile(multiProfilesConfig, []byte(fmt.Sprintf(`
113-
apiVersion: kubescheduler.config.k8s.io/v1alpha2
113+
apiVersion: kubescheduler.config.k8s.io/v1beta1
114114
kind: KubeSchedulerConfiguration
115115
clientConnection:
116116
kubeconfig: "%s"

‎hack/.golint_failures‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ pkg/registry/scheduling/rest
176176
pkg/registry/settings/rest
177177
pkg/registry/storage/rest
178178
pkg/registry/storage/storageclass
179-
pkg/scheduler/apis/config/v1alpha2
179+
pkg/scheduler/apis/config/v1beta1
180180
pkg/security/podsecuritypolicy
181181
pkg/security/podsecuritypolicy/group
182182
pkg/security/podsecuritypolicy/selinux

‎hack/.import-aliases‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"k8s.io/kubernetes/pkg/kubelet/apis/resourcemetrics/v1alpha1": "kubeletresourcemetricsv1alpha1",
5151
"k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1": "kubeletstatsv1alpha1",
5252
"k8s.io/kubernetes/pkg/proxy/apis/config/v1alpha1": "proxyconfigv1alpha1",
53-
"k8s.io/kubernetes/pkg/scheduler/apis/config/v1alpha1": "schedulerconfigv1alpha1",
53+
"k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta1": "schedulerconfigv1beta1",
5454
"k8s.io/kubernetes/test/e2e/framework/auth": "e2eauth",
5555
"k8s.io/kubernetes/test/e2e/framework/autoscaling": "e2eautoscaling",
5656
"k8s.io/kubernetes/test/e2e/framework/config": "e2econfig",

‎hack/local-up-cluster.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ function start_kubelet {
802802
if [ "${FAIL_SWAP_ON}" == "false" ]; then
803803
echo "WARNING : The kubelet is configured to not fail even if swap is enabled; production deployments should disable swap."
804804
fi
805-
805+
806806
if [[ "${REUSE_CERTS}" != true ]]; then
807807
# clear previous dynamic certs
808808
sudo rm -fr "/var/lib/kubelet/pki" "${CERT_DIR}/kubelet-rotated.kubeconfig"
@@ -863,7 +863,7 @@ function start_kubescheduler {
863863
SCHEDULER_LOG=${LOG_DIR}/kube-scheduler.log
864864

865865
cat <<EOF > /tmp/kube-scheduler.yaml
866-
apiVersion: kubescheduler.config.k8s.io/v1alpha2
866+
apiVersion: kubescheduler.config.k8s.io/v1beta1
867867
kind: KubeSchedulerConfiguration
868868
clientConnection:
869869
kubeconfig: ${CERT_DIR}/scheduler.kubeconfig

0 commit comments

Comments
 (0)