From 703f2a7b86a2340fce92b3f9dae12a30254620a3 Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Tue, 14 Dec 2021 16:57:56 +0800 Subject: [PATCH] kubeadm: mark v1beta2 as deprecated --- cmd/kubeadm/app/apis/kubeadm/v1beta2/doc.go | 2 ++ cmd/kubeadm/app/util/config/common.go | 4 +++- cmd/kubeadm/app/util/config/common_test.go | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta2/doc.go b/cmd/kubeadm/app/apis/kubeadm/v1beta2/doc.go index 4d86d91dbbb..071bd6567e5 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1beta2/doc.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1beta2/doc.go @@ -19,6 +19,8 @@ limitations under the License. // +k8s:deepcopy-gen=package // +k8s:conversion-gen=k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm +// Package v1beta2 has been DEPRECATED by v1beta3 +// // Package v1beta2 defines the v1beta2 version of the kubeadm configuration file format. // This version improves on the v1beta1 format by fixing some minor issues and adding a few new fields. // diff --git a/cmd/kubeadm/app/util/config/common.go b/cmd/kubeadm/app/util/config/common.go index 9d48f40bc3d..3b978ddd515 100644 --- a/cmd/kubeadm/app/util/config/common.go +++ b/cmd/kubeadm/app/util/config/common.go @@ -69,7 +69,9 @@ func validateSupportedVersion(gv schema.GroupVersion, allowDeprecated bool) erro } // Deprecated API versions are supported by us, but can only be used for migration. - deprecatedAPIVersions := map[string]struct{}{} + deprecatedAPIVersions := map[string]struct{}{ + "kubeadm.k8s.io/v1beta2": {}, + } gvString := gv.String() diff --git a/cmd/kubeadm/app/util/config/common_test.go b/cmd/kubeadm/app/util/config/common_test.go index f74ae8c20e5..b708657de71 100644 --- a/cmd/kubeadm/app/util/config/common_test.go +++ b/cmd/kubeadm/app/util/config/common_test.go @@ -73,6 +73,7 @@ func TestValidateSupportedVersion(t *testing.T) { Group: KubeadmGroupName, Version: "v1beta2", }, + allowDeprecated: true, }, { gv: schema.GroupVersion{