diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 34891d33466..cf99293d203 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -138,32 +138,6 @@ const ( // Enable pods to set sysctls on a pod Sysctls featuregate.Feature = "Sysctls" - // owner @smarterclayton - // alpha: v1.16 - // beta: v1.19 - // ga: v1.21 - // - // Enable legacy behavior to vary cluster functionality on the node-role.kubernetes.io labels. On by default (legacy), will be turned off in 1.18. - // Lock to false in v1.21 and remove in v1.22. - LegacyNodeRoleBehavior featuregate.Feature = "LegacyNodeRoleBehavior" - - // owner @brendandburns - // kep: http://kep.k8s.io/1143 - // alpha: v1.9 - // beta: v1.19 - // ga: v1.21 - // - // Enable nodes to exclude themselves from service load balancers - ServiceNodeExclusion featuregate.Feature = "ServiceNodeExclusion" - - // owner @smarterclayton - // alpha: v1.16 - // beta: v1.19 - // ga: v1.21 - // - // Enable nodes to exclude themselves from network disruption checks - NodeDisruptionExclusion featuregate.Feature = "NodeDisruptionExclusion" - // owner: @pospispa // GA: v1.11 // @@ -779,8 +753,6 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS MemoryManager: {Default: false, PreRelease: featuregate.Alpha}, CPUCFSQuotaPeriod: {Default: false, PreRelease: featuregate.Alpha}, TopologyManager: {Default: true, PreRelease: featuregate.Beta}, - ServiceNodeExclusion: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.23 - NodeDisruptionExclusion: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.22 StorageObjectInUseProtection: {Default: true, PreRelease: featuregate.GA}, SupportPodPidsLimit: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.23 SupportNodePidsLimit: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.23 @@ -879,6 +851,5 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS // features that enable backwards compatibility but are scheduled to be removed // ... - HPAScaleToZero: {Default: false, PreRelease: featuregate.Alpha}, - LegacyNodeRoleBehavior: {Default: false, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.22 + HPAScaleToZero: {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 04deab8c947..a22352d91fc 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 @@ -27,23 +27,6 @@ const ( // // alpha: v1.4 // MyFeature() bool - // owner @smarterclayton - // alpha: v1.16 - // beta: v1.19 - // - // Enable legacy behavior to vary cluster functionality on the node-role.kubernetes.io labels. On by default (legacy), will be turned off in 1.18. - // Original copy from k8s.io/kubernetes/pkg/features/kube_features.go - LegacyNodeRoleBehavior featuregate.Feature = "LegacyNodeRoleBehavior" - - // owner @brendandburns - // alpha: v1.9 - // beta: v1.19 - // ga: v1.21 - // - // Enable nodes to exclude themselves from service load balancers - // Original copy from k8s.io/kubernetes/pkg/features/kube_features.go - ServiceNodeExclusion featuregate.Feature = "ServiceNodeExclusion" - // owner: @khenidak // alpha: v1.15 // @@ -65,8 +48,6 @@ func SetupCurrentKubernetesSpecificFeatureGates(featuregates featuregate.Mutable // cloudPublicFeatureGates consists of cloud-specific feature keys. // 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{ - LegacyNodeRoleBehavior: {Default: false, PreRelease: featuregate.GA, LockToDefault: true}, - ServiceNodeExclusion: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, IPv6DualStack: {Default: true, PreRelease: featuregate.Beta}, ControllerManagerLeaderMigration: {Default: false, PreRelease: featuregate.Alpha}, }