github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

cleanup after CloudDualStackNodeIPs is GA

Browse Source
This commit is contained in:
carlory 2024-08-21 14:25:58 +08:00
parent beb696c2c9
commit aa3572d860
3 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/features/kube_features.go
View File

@ -84,14 +84,6 @@ const (
// Requires AuthorizeWithSelectors to be enabled. // Requires AuthorizeWithSelectors to be enabled.
AuthorizeNodeWithSelectors featuregate.Feature = "AuthorizeNodeWithSelectors" 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 // owner: @ahmedtd
// alpha: v1.26 // alpha: v1.26
// //
@ -1025,8 +1017,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
AuthorizeNodeWithSelectors: {Default: false, PreRelease: featuregate.Alpha}, AuthorizeNodeWithSelectors: {Default: false, PreRelease: featuregate.Alpha},
CloudDualStackNodeIPs: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.32
ClusterTrustBundle: {Default: false, PreRelease: featuregate.Alpha}, ClusterTrustBundle: {Default: false, PreRelease: featuregate.Alpha},
ClusterTrustBundleProjection: {Default: false, PreRelease: featuregate.Alpha}, ClusterTrustBundleProjection: {Default: false, PreRelease: featuregate.Alpha},

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

@ -38,15 +38,6 @@ const (
// Enable webhook in cloud controller manager // Enable webhook in cloud controller manager
CloudControllerManagerWebhook featuregate.Feature = "CloudControllerManagerWebhook" 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 // owner: @alexanderConstantinescu
// kep: http://kep.k8s.io/3458 // kep: http://kep.k8s.io/3458
// beta: v1.27 // 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. // 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{ var cloudPublicFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
CloudControllerManagerWebhook: {Default: false, PreRelease: featuregate.Alpha}, 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 StableLoadBalancerNodeSet: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // GA in 1.30, remove in 1.31
} }

6
test/featuregates_linter/test_data/unversioned_feature_list.yaml
View File

@ -100,12 +100,6 @@
lockToDefault: false lockToDefault: false
preRelease: Alpha preRelease: Alpha
version: "" version: ""
- name: CloudDualStackNodeIPs
versionedSpecs:
- default: true
lockToDefault: true
preRelease: GA
version: ""
- name: ClusterTrustBundle - name: ClusterTrustBundle
versionedSpecs: versionedSpecs:
- default: false - default: false