diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index ef0a15dd2e1..d1002e2e55d 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -84,14 +84,6 @@ const ( // Requires AuthorizeWithSelectors to be enabled. AuthorizeNodeWithSelectors featuregate.Feature = "AuthorizeNodeWithSelectors" - // owner: @danwinship - // alpha: v1.27 - // beta: v1.29 - // GA: v1.30 - // - // Enables dual-stack --node-ip in kubelet with external cloud providers - CloudDualStackNodeIPs featuregate.Feature = "CloudDualStackNodeIPs" - // owner: @ahmedtd // alpha: v1.26 // @@ -1025,8 +1017,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS AuthorizeNodeWithSelectors: {Default: false, PreRelease: featuregate.Alpha}, - CloudDualStackNodeIPs: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.32 - ClusterTrustBundle: {Default: false, PreRelease: featuregate.Alpha}, ClusterTrustBundleProjection: {Default: false, PreRelease: featuregate.Alpha}, diff --git a/staging/src/k8s.io/controller-manager/pkg/features/kube_features.go b/staging/src/k8s.io/controller-manager/pkg/features/kube_features.go index 65950dd8f57..f1cb5f6212a 100644 --- a/staging/src/k8s.io/controller-manager/pkg/features/kube_features.go +++ b/staging/src/k8s.io/controller-manager/pkg/features/kube_features.go @@ -38,15 +38,6 @@ const ( // Enable webhook in cloud controller manager CloudControllerManagerWebhook featuregate.Feature = "CloudControllerManagerWebhook" - // owner: @danwinship - // alpha: v1.27 - // beta: v1.29 - // GA: v1.30 - // - // Enables dual-stack values in the - // `alpha.kubernetes.io/provided-node-ip` annotation - CloudDualStackNodeIPs featuregate.Feature = "CloudDualStackNodeIPs" - // owner: @alexanderConstantinescu // kep: http://kep.k8s.io/3458 // beta: v1.27 @@ -65,6 +56,5 @@ func SetupCurrentKubernetesSpecificFeatureGates(featuregates featuregate.Mutable // To add a new feature, define a key for it at k8s.io/api/pkg/features and add it here. var cloudPublicFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{ CloudControllerManagerWebhook: {Default: false, PreRelease: featuregate.Alpha}, - CloudDualStackNodeIPs: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.32 StableLoadBalancerNodeSet: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // GA in 1.30, remove in 1.31 } diff --git a/test/featuregates_linter/test_data/unversioned_feature_list.yaml b/test/featuregates_linter/test_data/unversioned_feature_list.yaml index 8ed6dfe22e3..93b18b09198 100644 --- a/test/featuregates_linter/test_data/unversioned_feature_list.yaml +++ b/test/featuregates_linter/test_data/unversioned_feature_list.yaml @@ -100,12 +100,6 @@ lockToDefault: false preRelease: Alpha version: "" -- name: CloudDualStackNodeIPs - versionedSpecs: - - default: true - lockToDefault: true - preRelease: GA - version: "" - name: ClusterTrustBundle versionedSpecs: - default: false