From 532d1df7ca8ef2906b8cb73811a9c0364e576eba Mon Sep 17 00:00:00 2001 From: kerthcet Date: Tue, 6 Sep 2022 14:15:55 +0800 Subject: [PATCH 1/2] Modify release version of removing scheduler CC v1beta2 Signed-off-by: kerthcet --- cmd/kube-scheduler/app/options/configfile.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/kube-scheduler/app/options/configfile.go b/cmd/kube-scheduler/app/options/configfile.go index a11a33df872..c16251ee9f4 100644 --- a/cmd/kube-scheduler/app/options/configfile.go +++ b/cmd/kube-scheduler/app/options/configfile.go @@ -53,7 +53,7 @@ func loadConfig(data []byte) (*config.KubeSchedulerConfiguration, error) { // more details. cfgObj.TypeMeta.APIVersion = gvk.GroupVersion().String() if cfgObj.TypeMeta.APIVersion == configv1beta2.SchemeGroupVersion.String() { - klog.InfoS("KubeSchedulerConfiguration v1beta2 is deprecated in v1.25, will be removed in v1.26") + klog.InfoS("KubeSchedulerConfiguration v1beta2 is deprecated in v1.25, will be removed in v1.28") } return cfgObj, nil } From 700065a18dc72f89c3d849de01e01c735135ba4f Mon Sep 17 00:00:00 2001 From: kerthcet Date: Wed, 7 Sep 2022 10:09:27 +0800 Subject: [PATCH 2/2] Add deprecation warning of removing scheduler CC v1beta3 Signed-off-by: kerthcet --- cmd/kube-scheduler/app/options/configfile.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/kube-scheduler/app/options/configfile.go b/cmd/kube-scheduler/app/options/configfile.go index c16251ee9f4..8cc48328b52 100644 --- a/cmd/kube-scheduler/app/options/configfile.go +++ b/cmd/kube-scheduler/app/options/configfile.go @@ -52,8 +52,11 @@ func loadConfig(data []byte) (*config.KubeSchedulerConfiguration, error) { // conversion. See KubeSchedulerConfiguration internal type definition for // more details. cfgObj.TypeMeta.APIVersion = gvk.GroupVersion().String() - if cfgObj.TypeMeta.APIVersion == configv1beta2.SchemeGroupVersion.String() { + switch cfgObj.TypeMeta.APIVersion { + case configv1beta2.SchemeGroupVersion.String(): klog.InfoS("KubeSchedulerConfiguration v1beta2 is deprecated in v1.25, will be removed in v1.28") + case configv1beta3.SchemeGroupVersion.String(): + klog.InfoS("KubeSchedulerConfiguration v1beta3 is deprecated in v1.26, will be removed in v1.29") } return cfgObj, nil }