Merge pull request #104782 from kerthcet/cleanup/remove-cc-v1beta1

remove scheduler component config v1beta1
2025-09-15 22:20:51 +00:00 · 2021-10-04 08:53:08 -07:00
parent e5976909c6 75a255d2ed
commit 04f747d09f
28 changed files with 12 additions and 5683 deletions
--- a/cmd/kube-scheduler/app/options/configfile.go
+++ b/cmd/kube-scheduler/app/options/configfile.go
@@ -27,7 +27,6 @@ import (
 	"k8s.io/klog/v2"
 	"k8s.io/kubernetes/pkg/scheduler/apis/config"
 	"k8s.io/kubernetes/pkg/scheduler/apis/config/scheme"
-	configv1beta1 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta1"
 	configv1beta2 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta2"
 )

@@ -67,8 +66,6 @@ func encodeConfig(cfg *config.KubeSchedulerConfiguration) (*bytes.Buffer, error)

 	var encoder runtime.Encoder
 	switch cfg.TypeMeta.APIVersion {
-	case configv1beta1.SchemeGroupVersion.String():
-		encoder = scheme.Codecs.EncoderForVersion(info.Serializer, configv1beta1.SchemeGroupVersion)
 	case configv1beta2.SchemeGroupVersion.String():
 		encoder = scheme.Codecs.EncoderForVersion(info.Serializer, configv1beta2.SchemeGroupVersion)
 	default:
--- a/cmd/kube-scheduler/app/options/options_test.go
+++ b/cmd/kube-scheduler/app/options/options_test.go
@@ -35,11 +35,9 @@ import (
 	apiserveroptions "k8s.io/apiserver/pkg/server/options"
 	componentbaseconfig "k8s.io/component-base/config"
 	"k8s.io/component-base/logs"
-	"k8s.io/kube-scheduler/config/v1beta1"
 	"k8s.io/kube-scheduler/config/v1beta2"
 	kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
 	"k8s.io/kubernetes/pkg/scheduler/apis/config/latest"
-	configtesting "k8s.io/kubernetes/pkg/scheduler/apis/config/testing"
 	"k8s.io/kubernetes/pkg/scheduler/apis/config/testing/defaults"
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/names"
 )
@@ -120,17 +118,6 @@ leaderElection:
 		t.Fatal(err)
 	}

-	v1beta1VersionConfig := filepath.Join(tmpDir, "scheduler_v1beta1_api_version.yaml")
-	if err := ioutil.WriteFile(v1beta1VersionConfig, []byte(fmt.Sprintf(`
-apiVersion: kubescheduler.config.k8s.io/v1beta1
-kind: KubeSchedulerConfiguration
-clientConnection:
-  kubeconfig: "%s"
-leaderElection:
-  leaderElect: true`, configKubeconfig)), os.FileMode(0600)); err != nil {
-		t.Fatal(err)
-	}
-
 	unknownVersionConfig := filepath.Join(tmpDir, "scheduler_invalid_wrong_api_version.yaml")
 	if err := ioutil.WriteFile(unknownVersionConfig, []byte(fmt.Sprintf(`
 apiVersion: kubescheduler.config.k8s.io/unknown
@@ -231,38 +218,6 @@ profiles:
 		t.Fatal(err)
 	}

-	// plugin config
-	v1beta1PluginConfigFile := filepath.Join(tmpDir, "v1beta1_plugin.yaml")
-	if err := ioutil.WriteFile(v1beta1PluginConfigFile, []byte(fmt.Sprintf(`
-apiVersion: kubescheduler.config.k8s.io/v1beta1
-kind: KubeSchedulerConfiguration
-clientConnection:
-  kubeconfig: "%s"
-profiles:
- plugins:
-    reserve:
-      enabled:
-      - name: foo
-      - name: bar
-      disabled:
-      - name: VolumeBinding
-    preBind:
-      enabled:
-      - name: foo
-      disabled:
-      - name: VolumeBinding
-  pluginConfig:
-  - name: ServiceAffinity
-    args:
-      affinityLabels: []
-      antiAffinityLabelsPreference: []
-  - name: foo
-    args:
-      bar: baz
-`, configKubeconfig)), os.FileMode(0600)); err != nil {
-		t.Fatal(err)
-	}
-
 	// multiple profiles config
 	multiProfilesConfig := filepath.Join(tmpDir, "multi-profiles.yaml")
 	if err := ioutil.WriteFile(multiProfilesConfig, []byte(fmt.Sprintf(`
@@ -290,33 +245,6 @@ profiles:
 		t.Fatal(err)
 	}

-	// multiple profiles config
-	v1beta1MultiProfilesConfig := filepath.Join(tmpDir, "v1beta1_multi-profiles.yaml")
-	if err := ioutil.WriteFile(v1beta1MultiProfilesConfig, []byte(fmt.Sprintf(`
-apiVersion: kubescheduler.config.k8s.io/v1beta1
-kind: KubeSchedulerConfiguration
-clientConnection:
-  kubeconfig: "%s"
-profiles:
- schedulerName: "foo-profile"
-  plugins:
-    reserve:
-      enabled:
-      - name: foo
-      - name: VolumeBinding
-      disabled:
-      - name: VolumeBinding
- schedulerName: "bar-profile"
-  plugins:
-    preBind:
-      disabled:
-      - name: VolumeBinding
-  pluginConfig:
-  - name: foo
-`, configKubeconfig)), os.FileMode(0600)); err != nil {
-		t.Fatal(err)
-	}
-
 	// Insulate this test from picking up in-cluster config when run inside a pod
 	// We can't assume we have permissions to write to /var/run/secrets/... from a unit test to mock in-cluster config for testing
 	originalHost := os.Getenv("KUBERNETES_SERVICE_HOST")
@@ -411,77 +339,6 @@ profiles:
 				},
 			},
 		},
-		{
-			name: "v1beta1 config file",
-			options: &Options{
-				ConfigFile: v1beta1VersionConfig,
-				ComponentConfig: func() kubeschedulerconfig.KubeSchedulerConfiguration {
-					cfg := configtesting.V1beta1ToInternalWithDefaults(t, v1beta1.KubeSchedulerConfiguration{})
-					return *cfg
-				}(),
-				SecureServing: (&apiserveroptions.SecureServingOptions{
-					ServerCert: apiserveroptions.GeneratableKeyCert{
-						CertDirectory: "/a/b/c",
-						PairName:      "kube-scheduler",
-					},
-					HTTP2MaxStreamsPerConnection: 47,
-				}).WithLoopback(),
-				Authentication: &apiserveroptions.DelegatingAuthenticationOptions{
-					CacheTTL:   10 * time.Second,
-					ClientCert: apiserveroptions.ClientCertAuthenticationOptions{},
-					RequestHeader: apiserveroptions.RequestHeaderAuthenticationOptions{
-						UsernameHeaders:     []string{"x-remote-user"},
-						GroupHeaders:        []string{"x-remote-group"},
-						ExtraHeaderPrefixes: []string{"x-remote-extra-"},
-					},
-					RemoteKubeConfigFileOptional: true,
-				},
-				Authorization: &apiserveroptions.DelegatingAuthorizationOptions{
-					AllowCacheTTL:                10 * time.Second,
-					DenyCacheTTL:                 10 * time.Second,
-					RemoteKubeConfigFileOptional: true,
-					AlwaysAllowPaths:             []string{"/healthz", "/readyz", "/livez"}, // note: this does not match /healthz/ or /healthz/*
-					AlwaysAllowGroups:            []string{"system:masters"},
-				},
-				Logs: logs.NewOptions(),
-			},
-			expectedUsername: "config",
-			expectedConfig: kubeschedulerconfig.KubeSchedulerConfiguration{
-				TypeMeta: metav1.TypeMeta{
-					APIVersion: v1beta1.SchemeGroupVersion.String(),
-				},
-				Parallelism: 16,
-				DebuggingConfiguration: componentbaseconfig.DebuggingConfiguration{
-					EnableProfiling:           true,
-					EnableContentionProfiling: true,
-				},
-				LeaderElection: componentbaseconfig.LeaderElectionConfiguration{
-					LeaderElect:       true,
-					LeaseDuration:     metav1.Duration{Duration: 15 * time.Second},
-					RenewDeadline:     metav1.Duration{Duration: 10 * time.Second},
-					RetryPeriod:       metav1.Duration{Duration: 2 * time.Second},
-					ResourceLock:      "leases",
-					ResourceNamespace: "kube-system",
-					ResourceName:      "kube-scheduler",
-				},
-				ClientConnection: componentbaseconfig.ClientConnectionConfiguration{
-					Kubeconfig:  configKubeconfig,
-					QPS:         50,
-					Burst:       100,
-					ContentType: "application/vnd.kubernetes.protobuf",
-				},
-				PercentageOfNodesToScore: defaultPercentageOfNodesToScore,
-				PodInitialBackoffSeconds: defaultPodInitialBackoffSeconds,
-				PodMaxBackoffSeconds:     defaultPodMaxBackoffSeconds,
-				Profiles: []kubeschedulerconfig.KubeSchedulerProfile{
-					{
-						SchedulerName: "default-scheduler",
-						Plugins:       defaults.PluginsV1beta1,
-						PluginConfig:  defaults.PluginConfigsV1beta1,
-					},
-				},
-			},
-		},
 		{
 			name: "config file in componentconfig/v1alpha1",
 			options: &Options{
@@ -769,133 +626,6 @@ profiles:
 				},
 			},
 		},
-		{
-			name: "v1beta1 plugin config",
-			options: &Options{
-				ConfigFile: v1beta1PluginConfigFile,
-				Logs:       logs.NewOptions(),
-			},
-			expectedUsername: "config",
-			expectedConfig: kubeschedulerconfig.KubeSchedulerConfiguration{
-				TypeMeta: metav1.TypeMeta{
-					APIVersion: v1beta1.SchemeGroupVersion.String(),
-				},
-				Parallelism: 16,
-				DebuggingConfiguration: componentbaseconfig.DebuggingConfiguration{
-					EnableProfiling:           true,
-					EnableContentionProfiling: true,
-				},
-				LeaderElection: componentbaseconfig.LeaderElectionConfiguration{
-					LeaderElect:       true,
-					LeaseDuration:     metav1.Duration{Duration: 15 * time.Second},
-					RenewDeadline:     metav1.Duration{Duration: 10 * time.Second},
-					RetryPeriod:       metav1.Duration{Duration: 2 * time.Second},
-					ResourceLock:      "leases",
-					ResourceNamespace: "kube-system",
-					ResourceName:      "kube-scheduler",
-				},
-				ClientConnection: componentbaseconfig.ClientConnectionConfiguration{
-					Kubeconfig:  configKubeconfig,
-					QPS:         50,
-					Burst:       100,
-					ContentType: "application/vnd.kubernetes.protobuf",
-				},
-				PercentageOfNodesToScore: defaultPercentageOfNodesToScore,
-				PodInitialBackoffSeconds: defaultPodInitialBackoffSeconds,
-				PodMaxBackoffSeconds:     defaultPodMaxBackoffSeconds,
-				Profiles: []kubeschedulerconfig.KubeSchedulerProfile{
-					{
-						SchedulerName: "default-scheduler",
-						Plugins: &kubeschedulerconfig.Plugins{
-							QueueSort:  defaults.PluginsV1beta1.QueueSort,
-							PreFilter:  defaults.PluginsV1beta1.PreFilter,
-							Filter:     defaults.PluginsV1beta1.Filter,
-							PostFilter: defaults.PluginsV1beta1.PostFilter,
-							PreScore:   defaults.PluginsV1beta1.PreScore,
-							Score:      defaults.PluginsV1beta1.Score,
-							Reserve: kubeschedulerconfig.PluginSet{
-								Enabled: []kubeschedulerconfig.Plugin{
-									{Name: "foo"},
-									{Name: "bar"},
-								},
-							},
-							PreBind: kubeschedulerconfig.PluginSet{
-								Enabled: []kubeschedulerconfig.Plugin{
-									{Name: "foo"},
-								},
-							},
-							Bind: defaults.PluginsV1beta1.Bind,
-						},
-						PluginConfig: []kubeschedulerconfig.PluginConfig{
-							{
-								Name: "ServiceAffinity",
-								Args: &kubeschedulerconfig.ServiceAffinityArgs{
-									AffinityLabels:               []string{},
-									AntiAffinityLabelsPreference: []string{},
-								},
-							},
-							{
-								Name: "foo",
-								Args: &runtime.Unknown{
-									Raw:         []byte(`{"bar":"baz"}`),
-									ContentType: "application/json",
-								},
-							},
-							{
-								Name: "DefaultPreemption",
-								Args: &kubeschedulerconfig.DefaultPreemptionArgs{
-									MinCandidateNodesPercentage: 10,
-									MinCandidateNodesAbsolute:   100,
-								},
-							},
-							{
-								Name: "InterPodAffinity",
-								Args: &kubeschedulerconfig.InterPodAffinityArgs{
-									HardPodAffinityWeight: 1,
-								},
-							},
-							{
-								Name: "NodeAffinity",
-								Args: &kubeschedulerconfig.NodeAffinityArgs{},
-							},
-							{
-								Name: "NodeResourcesBalancedAllocation",
-								Args: &kubeschedulerconfig.NodeResourcesBalancedAllocationArgs{
-									Resources: []kubeschedulerconfig.ResourceSpec{{Name: "cpu", Weight: 1}, {Name: "memory", Weight: 1}},
-								},
-							},
-							{
-								Name: "NodeResourcesFit",
-								Args: &kubeschedulerconfig.NodeResourcesFitArgs{
-									ScoringStrategy: &kubeschedulerconfig.ScoringStrategy{
-										Type:      kubeschedulerconfig.LeastAllocated,
-										Resources: []kubeschedulerconfig.ResourceSpec{{Name: "cpu", Weight: 1}, {Name: "memory", Weight: 1}},
-									},
-								},
-							},
-							{
-								Name: "NodeResourcesLeastAllocated",
-								Args: &kubeschedulerconfig.NodeResourcesLeastAllocatedArgs{
-									Resources: []kubeschedulerconfig.ResourceSpec{{Name: "cpu", Weight: 1}, {Name: "memory", Weight: 1}},
-								},
-							},
-							{
-								Name: "PodTopologySpread",
-								Args: &kubeschedulerconfig.PodTopologySpreadArgs{
-									DefaultingType: kubeschedulerconfig.SystemDefaulting,
-								},
-							},
-							{
-								Name: "VolumeBinding",
-								Args: &kubeschedulerconfig.VolumeBindingArgs{
-									BindTimeoutSeconds: 600,
-								},
-							},
-						},
-					},
-				},
-			},
-		},
 		{
 			name: "multiple profiles",
 			options: &Options{
@@ -1016,132 +746,6 @@ profiles:
 				},
 			},
 		},
-		{
-			name: "v1beta1 multiple profiles",
-			options: &Options{
-				ConfigFile: v1beta1MultiProfilesConfig,
-				Logs:       logs.NewOptions(),
-			},
-			expectedUsername: "config",
-			expectedConfig: kubeschedulerconfig.KubeSchedulerConfiguration{
-				TypeMeta: metav1.TypeMeta{
-					APIVersion: v1beta1.SchemeGroupVersion.String(),
-				},
-				Parallelism: 16,
-				DebuggingConfiguration: componentbaseconfig.DebuggingConfiguration{
-					EnableProfiling:           true,
-					EnableContentionProfiling: true,
-				},
-				LeaderElection: componentbaseconfig.LeaderElectionConfiguration{
-					LeaderElect:       true,
-					LeaseDuration:     metav1.Duration{Duration: 15 * time.Second},
-					RenewDeadline:     metav1.Duration{Duration: 10 * time.Second},
-					RetryPeriod:       metav1.Duration{Duration: 2 * time.Second},
-					ResourceLock:      "leases",
-					ResourceNamespace: "kube-system",
-					ResourceName:      "kube-scheduler",
-				},
-				ClientConnection: componentbaseconfig.ClientConnectionConfiguration{
-					Kubeconfig:  configKubeconfig,
-					QPS:         50,
-					Burst:       100,
-					ContentType: "application/vnd.kubernetes.protobuf",
-				},
-				PercentageOfNodesToScore: defaultPercentageOfNodesToScore,
-				PodInitialBackoffSeconds: defaultPodInitialBackoffSeconds,
-				PodMaxBackoffSeconds:     defaultPodMaxBackoffSeconds,
-				Profiles: []kubeschedulerconfig.KubeSchedulerProfile{
-					{
-						SchedulerName: "foo-profile",
-						Plugins: &kubeschedulerconfig.Plugins{
-							QueueSort:  defaults.PluginsV1beta1.QueueSort,
-							PreFilter:  defaults.PluginsV1beta1.PreFilter,
-							Filter:     defaults.PluginsV1beta1.Filter,
-							PostFilter: defaults.PluginsV1beta1.PostFilter,
-							PreScore:   defaults.PluginsV1beta1.PreScore,
-							Score:      defaults.PluginsV1beta1.Score,
-							Bind:       defaults.PluginsV1beta1.Bind,
-							PreBind:    defaults.PluginsV1beta1.PreBind,
-							Reserve: kubeschedulerconfig.PluginSet{
-								Enabled: []kubeschedulerconfig.Plugin{
-									{Name: "foo"},
-									{Name: names.VolumeBinding},
-								},
-							},
-						},
-						PluginConfig: defaults.PluginConfigsV1beta1,
-					},
-					{
-						SchedulerName: "bar-profile",
-						Plugins: &kubeschedulerconfig.Plugins{
-							QueueSort:  defaults.PluginsV1beta1.QueueSort,
-							PreFilter:  defaults.PluginsV1beta1.PreFilter,
-							Filter:     defaults.PluginsV1beta1.Filter,
-							PostFilter: defaults.PluginsV1beta1.PostFilter,
-							PreScore:   defaults.PluginsV1beta1.PreScore,
-							Score:      defaults.PluginsV1beta1.Score,
-							Bind:       defaults.PluginsV1beta1.Bind,
-							Reserve:    defaults.PluginsV1beta1.Reserve,
-						},
-						PluginConfig: []kubeschedulerconfig.PluginConfig{
-							{
-								Name: "foo",
-							},
-							{
-								Name: "DefaultPreemption",
-								Args: &kubeschedulerconfig.DefaultPreemptionArgs{
-									MinCandidateNodesPercentage: 10,
-									MinCandidateNodesAbsolute:   100,
-								},
-							},
-							{
-								Name: "InterPodAffinity",
-								Args: &kubeschedulerconfig.InterPodAffinityArgs{
-									HardPodAffinityWeight: 1,
-								},
-							},
-							{
-								Name: "NodeAffinity",
-								Args: &kubeschedulerconfig.NodeAffinityArgs{},
-							},
-							{
-								Name: "NodeResourcesBalancedAllocation",
-								Args: &kubeschedulerconfig.NodeResourcesBalancedAllocationArgs{
-									Resources: []kubeschedulerconfig.ResourceSpec{{Name: "cpu", Weight: 1}, {Name: "memory", Weight: 1}},
-								},
-							},
-							{
-								Name: "NodeResourcesFit",
-								Args: &kubeschedulerconfig.NodeResourcesFitArgs{
-									ScoringStrategy: &kubeschedulerconfig.ScoringStrategy{
-										Type:      kubeschedulerconfig.LeastAllocated,
-										Resources: []kubeschedulerconfig.ResourceSpec{{Name: "cpu", Weight: 1}, {Name: "memory", Weight: 1}},
-									},
-								},
-							},
-							{
-								Name: "NodeResourcesLeastAllocated",
-								Args: &kubeschedulerconfig.NodeResourcesLeastAllocatedArgs{
-									Resources: []kubeschedulerconfig.ResourceSpec{{Name: "cpu", Weight: 1}, {Name: "memory", Weight: 1}},
-								},
-							},
-							{
-								Name: "PodTopologySpread",
-								Args: &kubeschedulerconfig.PodTopologySpreadArgs{
-									DefaultingType: kubeschedulerconfig.SystemDefaulting,
-								},
-							},
-							{
-								Name: "VolumeBinding",
-								Args: &kubeschedulerconfig.VolumeBindingArgs{
-									BindTimeoutSeconds: 600,
-								},
-							},
-						},
-					},
-				},
-			},
-		},
 		{
 			name: "Attempting to set Component Config Profiles and Policy config",
 			options: &Options{
--- a/cmd/kube-scheduler/app/server_test.go
+++ b/cmd/kube-scheduler/app/server_test.go
@@ -75,7 +75,7 @@ users:
 	// plugin config
 	pluginConfigFile := filepath.Join(tmpDir, "plugin.yaml")
 	if err := ioutil.WriteFile(pluginConfigFile, []byte(fmt.Sprintf(`
-apiVersion: kubescheduler.config.k8s.io/v1beta1
+apiVersion: kubescheduler.config.k8s.io/v1beta2
 kind: KubeSchedulerConfiguration
 clientConnection:
  kubeconfig: "%s"
@@ -112,7 +112,7 @@ profiles:
 	// multiple profiles config
 	multiProfilesConfig := filepath.Join(tmpDir, "multi-profiles.yaml")
 	if err := ioutil.WriteFile(multiProfilesConfig, []byte(fmt.Sprintf(`
-apiVersion: kubescheduler.config.k8s.io/v1beta1
+apiVersion: kubescheduler.config.k8s.io/v1beta2
 kind: KubeSchedulerConfiguration
 clientConnection:
  kubeconfig: "%s"