diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 5a9d4059047..c03180a73c4 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -233,7 +233,9 @@ const ( // owner: @HirazawaUi // kep: http://kep.k8s.io/4004 - // Deprecated: v1.29 (default off) + // alpha: v1.29 + // Deprecated: v1.31 (default off) + // // DisableNodeKubeProxyVersion disable the status.nodeInfo.kubeProxyVersion field of v1.Node DisableNodeKubeProxyVersion featuregate.Feature = "DisableNodeKubeProxyVersion" @@ -975,12 +977,4 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS CloudControllerManagerWebhook: {Default: false, PreRelease: featuregate.Alpha}, InPlacePodVerticalScaling: {Default: false, PreRelease: featuregate.Alpha}, - - // features that enable backwards compatibility but are scheduled to be removed - // ... - AllowDNSOnlyNodeCSR: {Default: false, PreRelease: featuregate.Deprecated}, // remove after 1.33 - - AllowInsecureKubeletCertificateSigningRequests: {Default: false, PreRelease: featuregate.Deprecated}, // remove in 1.33 - - DisableNodeKubeProxyVersion: {Default: false, PreRelease: featuregate.Deprecated}, // default on in 1.33 } diff --git a/pkg/features/versioned_kube_features.go b/pkg/features/versioned_kube_features.go index 1fdaed8b446..decc2846484 100644 --- a/pkg/features/versioned_kube_features.go +++ b/pkg/features/versioned_kube_features.go @@ -34,6 +34,14 @@ import ( // // Entries are alphabetized. var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate.VersionedSpecs{ + AllowDNSOnlyNodeCSR: { + {Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Deprecated}, + }, + + AllowInsecureKubeletCertificateSigningRequests: { + {Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Deprecated}, + }, + AllowOverwriteTerminationGracePeriodSeconds: { {Version: version.MustParse("1.32"), Default: false, PreRelease: featuregate.Deprecated}, }, @@ -146,6 +154,11 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate {Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, }, + DisableNodeKubeProxyVersion: { + {Version: version.MustParse("1.29"), Default: false, PreRelease: featuregate.Alpha}, + {Version: version.MustParse("1.31"), Default: false, PreRelease: featuregate.Deprecated}, + }, + DRAControlPlaneController: { {Version: version.MustParse("1.26"), Default: false, PreRelease: featuregate.Alpha}, }, diff --git a/test/featuregates_linter/test_data/unversioned_feature_list.yaml b/test/featuregates_linter/test_data/unversioned_feature_list.yaml index 1279e5ab647..a71560fc05c 100644 --- a/test/featuregates_linter/test_data/unversioned_feature_list.yaml +++ b/test/featuregates_linter/test_data/unversioned_feature_list.yaml @@ -1,15 +1,3 @@ -- name: AllowDNSOnlyNodeCSR - versionedSpecs: - - default: false - lockToDefault: false - preRelease: Deprecated - version: "" -- name: AllowInsecureKubeletCertificateSigningRequests - versionedSpecs: - - default: false - lockToDefault: false - preRelease: Deprecated - version: "" - name: CloudControllerManagerWebhook versionedSpecs: - default: false @@ -28,12 +16,6 @@ lockToDefault: false preRelease: Beta version: "" -- name: DisableNodeKubeProxyVersion - versionedSpecs: - - default: false - lockToDefault: false - preRelease: Deprecated - version: "" - name: InPlacePodVerticalScaling versionedSpecs: - default: false diff --git a/test/featuregates_linter/test_data/versioned_feature_list.yaml b/test/featuregates_linter/test_data/versioned_feature_list.yaml index 804cdd370d0..a4fc633517e 100644 --- a/test/featuregates_linter/test_data/versioned_feature_list.yaml +++ b/test/featuregates_linter/test_data/versioned_feature_list.yaml @@ -26,6 +26,18 @@ lockToDefault: true preRelease: GA version: "1.30" +- name: AllowDNSOnlyNodeCSR + versionedSpecs: + - default: false + lockToDefault: false + preRelease: Deprecated + version: "1.31" +- name: AllowInsecureKubeletCertificateSigningRequests + versionedSpecs: + - default: false + lockToDefault: false + preRelease: Deprecated + version: "1.31" - name: AllowOverwriteTerminationGracePeriodSeconds versionedSpecs: - default: false @@ -320,6 +332,16 @@ lockToDefault: true preRelease: GA version: "1.31" +- name: DisableNodeKubeProxyVersion + versionedSpecs: + - default: false + lockToDefault: false + preRelease: Alpha + version: "1.29" + - default: false + lockToDefault: false + preRelease: Deprecated + version: "1.31" - name: DRAControlPlaneController versionedSpecs: - default: false