scheduler: remove deprecated v1beta2 KubeSchedulerConfiguration

kubernetes · Aug 17, 2023 · 427b703 · 427b703
1 parent 4f874a2
commit 427b703
Show file tree

Hide file tree

Showing 29 changed files with 14 additions and 6,893 deletions.
diff --git a/api/api-rules/violation_exceptions.list b/api/api-rules/violation_exceptions.list
@@ -323,9 +323,6 @@ API rule violation: list_type_missing,k8s.io/kube-controller-manager/config/v1al
 API rule violation: list_type_missing,k8s.io/kube-controller-manager/config/v1alpha1,PersistentVolumeBinderControllerConfiguration,VolumeHostCIDRDenylist
 API rule violation: list_type_missing,k8s.io/kube-proxy/config/v1alpha1,KubeProxyConfiguration,NodePortAddresses
 API rule violation: list_type_missing,k8s.io/kube-proxy/config/v1alpha1,KubeProxyIPVSConfiguration,ExcludeCIDRs
-API rule violation: list_type_missing,k8s.io/kube-scheduler/config/v1beta3,ExtenderTLSConfig,CAData
-API rule violation: list_type_missing,k8s.io/kube-scheduler/config/v1beta3,ExtenderTLSConfig,CertData
-API rule violation: list_type_missing,k8s.io/kube-scheduler/config/v1beta3,ExtenderTLSConfig,KeyData
 API rule violation: list_type_missing,k8s.io/kubelet/config/v1,CredentialProvider,Args
 API rule violation: list_type_missing,k8s.io/kubelet/config/v1,CredentialProvider,Env
 API rule violation: list_type_missing,k8s.io/kubelet/config/v1,CredentialProvider,MatchImages

diff --git a/cmd/kube-scheduler/app/options/configfile.go b/cmd/kube-scheduler/app/options/configfile.go
@@ -27,7 +27,6 @@ import (
 	"k8s.io/kubernetes/pkg/scheduler/apis/config"
 	"k8s.io/kubernetes/pkg/scheduler/apis/config/scheme"
 	configv1 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1"
-	configv1beta3 "k8s.io/kubernetes/pkg/scheduler/apis/config/v1beta3"
 )
 
 // LoadConfigFromFile loads scheduler config from the specified file path
@@ -52,10 +51,6 @@ func loadConfig(logger klog.Logger, data []byte) (*config.KubeSchedulerConfigura
 		// conversion. See KubeSchedulerConfiguration internal type definition for
 		// more details.
 		cfgObj.TypeMeta.APIVersion = gvk.GroupVersion().String()
-		switch cfgObj.TypeMeta.APIVersion {
-		case configv1beta3.SchemeGroupVersion.String():
-			logger.Info("KubeSchedulerConfiguration v1beta3 is deprecated in v1.26, will be removed in v1.29")
-		}
 		return cfgObj, nil
 	}
 	return nil, fmt.Errorf("couldn't decode as KubeSchedulerConfiguration, got %s: ", gvk)
@@ -71,8 +66,6 @@ func encodeConfig(cfg *config.KubeSchedulerConfiguration) (*bytes.Buffer, error)
 
 	var encoder runtime.Encoder
 	switch cfg.TypeMeta.APIVersion {
-	case configv1beta3.SchemeGroupVersion.String():
-		encoder = scheme.Codecs.EncoderForVersion(info.Serializer, configv1beta3.SchemeGroupVersion)
 	case configv1.SchemeGroupVersion.String():
 		encoder = scheme.Codecs.EncoderForVersion(info.Serializer, configv1.SchemeGroupVersion)
 	default: