From 66a18df14c2debf39027763ed92565342d5bb388 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Wed, 9 Feb 2022 18:33:27 +0200 Subject: [PATCH] kubeadm: switch UnversionedKubeletConfigMap to true - Graduate the feature gate to Beta and enable it by default. - Pre-set the default value for UnversionedKubeletConfigMap to "true" in test/e2e_kubeadm. - Fix a couple of typos in "tolerate" introduced in the PR that added the FG in 1.23. --- cmd/kubeadm/app/features/features.go | 4 ++-- cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go | 4 ++-- test/e2e_kubeadm/kubelet_config_test.go | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cmd/kubeadm/app/features/features.go b/cmd/kubeadm/app/features/features.go index a52ecf928b3..90c4663df1b 100644 --- a/cmd/kubeadm/app/features/features.go +++ b/cmd/kubeadm/app/features/features.go @@ -33,7 +33,7 @@ const ( PublicKeysECDSA = "PublicKeysECDSA" // RootlessControlPlane is expected to be in alpha in v1.22 RootlessControlPlane = "RootlessControlPlane" - // UnversionedKubeletConfigMap is expected to be alpha in 1.23 + // UnversionedKubeletConfigMap is expected to be beta in 1.24 UnversionedKubeletConfigMap = "UnversionedKubeletConfigMap" ) @@ -41,7 +41,7 @@ const ( var InitFeatureGates = FeatureList{ PublicKeysECDSA: {FeatureSpec: featuregate.FeatureSpec{Default: false, PreRelease: featuregate.Alpha}}, RootlessControlPlane: {FeatureSpec: featuregate.FeatureSpec{Default: false, PreRelease: featuregate.Alpha}}, - UnversionedKubeletConfigMap: {FeatureSpec: featuregate.FeatureSpec{Default: false, PreRelease: featuregate.Alpha}}, + UnversionedKubeletConfigMap: {FeatureSpec: featuregate.FeatureSpec{Default: true, PreRelease: featuregate.Beta}}, } // Feature represents a feature being gated diff --git a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go index 4eaa8c97cfa..17c2a24cdb6 100644 --- a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go +++ b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go @@ -262,7 +262,7 @@ func TestCreateKubeConfigFileIfNotExists(t *testing.T) { kubeConfig: configWithAnotherClusterCa, expectedError: true, }, - { // if KubeConfig is not equal to the existingKubeConfig - tollerate custom server addresses + { // if KubeConfig is not equal to the existingKubeConfig - tolerate custom server addresses name: "KubeConfig referst to the cluster with another address", existingKubeConfig: config, kubeConfig: configWithAnotherClusterAddress, @@ -484,7 +484,7 @@ func TestValidateKubeConfig(t *testing.T) { configWithAnotherServerURL := setupdKubeConfigWithClientAuth(t, caCert, caKey, "https://4.3.2.1:4321", "test-cluster", "myOrg1") // create a valid config but with whitespace around the CA PEM. - // validateKubeConfig() should tollerate that. + // validateKubeConfig() should tolerate that. configWhitespace := config.DeepCopy() configWhitespaceCtx := configWhitespace.Contexts[configWhitespace.CurrentContext] configWhitespaceCA := string(configWhitespace.Clusters[configWhitespaceCtx.Cluster].CertificateAuthorityData) diff --git a/test/e2e_kubeadm/kubelet_config_test.go b/test/e2e_kubeadm/kubelet_config_test.go index c699a549c83..c966764f777 100644 --- a/test/e2e_kubeadm/kubelet_config_test.go +++ b/test/e2e_kubeadm/kubelet_config_test.go @@ -82,11 +82,9 @@ var _ = Describe("kubelet-config ConfigMap", func() { // Extract the value of the UnversionedKubeletConfigMap feature gate if its present. // TODO: remove this after the UnversionedKubeletConfigMap feature gate goes GA: // https://github.com/kubernetes/kubeadm/issues/1582 - var UnversionedKubeletConfigMap bool + UnversionedKubeletConfigMap := true if _, ok := m["featureGates"]; ok { if featureGates, ok := m["featureGates"].(map[interface{}]interface{}); ok { - // TODO: update the default to true once this graduates to Beta. - UnversionedKubeletConfigMap = false if val, ok := featureGates["UnversionedKubeletConfigMap"]; ok { if valBool, ok := val.(bool); ok { UnversionedKubeletConfigMap = valBool