Skip to content

Commit 243fdaf

Browse files
authored
Merge pull request kubernetes#126840 from carlory/CloudDualStackNodeIPs
cleanup after CloudDualStackNodeIPs is GA
2 parents b1aadef + aa3572d commit 243fdaf

File tree

3 files changed

+0
-26
lines changed

3 files changed

+0
-26
lines changed

pkg/features/kube_features.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,6 @@ const (
8484
// Requires AuthorizeWithSelectors to be enabled.
8585
AuthorizeNodeWithSelectors featuregate.Feature = "AuthorizeNodeWithSelectors"
8686

87-
// owner: @danwinship
88-
// alpha: v1.27
89-
// beta: v1.29
90-
// GA: v1.30
91-
//
92-
// Enables dual-stack --node-ip in kubelet with external cloud providers
93-
CloudDualStackNodeIPs featuregate.Feature = "CloudDualStackNodeIPs"
94-
9587
// owner: @ahmedtd
9688
// alpha: v1.26
9789
//
@@ -1025,8 +1017,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
10251017

10261018
AuthorizeNodeWithSelectors: {Default: false, PreRelease: featuregate.Alpha},
10271019

1028-
CloudDualStackNodeIPs: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.32
1029-
10301020
ClusterTrustBundle: {Default: false, PreRelease: featuregate.Alpha},
10311021

10321022
ClusterTrustBundleProjection: {Default: false, PreRelease: featuregate.Alpha},

staging/src/k8s.io/controller-manager/pkg/features/kube_features.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,6 @@ const (
3838
// Enable webhook in cloud controller manager
3939
CloudControllerManagerWebhook featuregate.Feature = "CloudControllerManagerWebhook"
4040

41-
// owner: @danwinship
42-
// alpha: v1.27
43-
// beta: v1.29
44-
// GA: v1.30
45-
//
46-
// Enables dual-stack values in the
47-
// `alpha.kubernetes.io/provided-node-ip` annotation
48-
CloudDualStackNodeIPs featuregate.Feature = "CloudDualStackNodeIPs"
49-
5041
// owner: @alexanderConstantinescu
5142
// kep: http://kep.k8s.io/3458
5243
// beta: v1.27
@@ -65,6 +56,5 @@ func SetupCurrentKubernetesSpecificFeatureGates(featuregates featuregate.Mutable
6556
// To add a new feature, define a key for it at k8s.io/api/pkg/features and add it here.
6657
var cloudPublicFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
6758
CloudControllerManagerWebhook: {Default: false, PreRelease: featuregate.Alpha},
68-
CloudDualStackNodeIPs: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.32
6959
StableLoadBalancerNodeSet: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // GA in 1.30, remove in 1.31
7060
}

test/featuregates_linter/test_data/unversioned_feature_list.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,6 @@
100100
lockToDefault: false
101101
preRelease: Alpha
102102
version: ""
103-
- name: CloudDualStackNodeIPs
104-
versionedSpecs:
105-
- default: true
106-
lockToDefault: true
107-
preRelease: GA
108-
version: ""
109103
- name: ClusterTrustBundle
110104
versionedSpecs:
111105
- default: false

0 commit comments

Comments
 (0)