github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #116255 from danwinship/controller-manager-ipv6dualstack

Browse Source 
Belatedly remove controller-manager IPv6DualStack feature gate
This commit is contained in:
Kubernetes Prow Robot 2023-03-06 08:19:05 -08:00 committed by GitHub
commit ff27ccfabc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/cloud-provider/app/core.go
View File

@ -33,7 +33,6 @@ import (
servicecontroller "k8s.io/cloud-provider/controllers/service" servicecontroller "k8s.io/cloud-provider/controllers/service"
controllermanagerapp "k8s.io/controller-manager/app" controllermanagerapp "k8s.io/controller-manager/app"
"k8s.io/controller-manager/controller" "k8s.io/controller-manager/controller"
"k8s.io/controller-manager/pkg/features"
"k8s.io/klog/v2" "k8s.io/klog/v2"
netutils "k8s.io/utils/net" netutils "k8s.io/utils/net"
@ -119,11 +118,6 @@ func startRouteController(ctx context.Context, initContext ControllerInitContext
return nil, false, err return nil, false, err
} }
// failure: more than one cidr and dual stack is not enabled
if len(clusterCIDRs) > 1 && !utilfeature.DefaultFeatureGate.Enabled(features.IPv6DualStack) {
return nil, false, fmt.Errorf("len of ClusterCIDRs==%v and dualstack feature is not enabled", len(clusterCIDRs))
}
// failure: more than one cidr but they are not configured as dual stack // failure: more than one cidr but they are not configured as dual stack
if len(clusterCIDRs) > 1 && !dualStack { if len(clusterCIDRs) > 1 && !dualStack {
return nil, false, fmt.Errorf("len of ClusterCIDRs==%v and they are not configured as dual stack (at least one from each IPFamily", len(clusterCIDRs)) return nil, false, fmt.Errorf("len of ClusterCIDRs==%v and they are not configured as dual stack (at least one from each IPFamily", len(clusterCIDRs))

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

@ -21,23 +21,16 @@ import (
) )
const ( const (
// Every feature gate should add method here following this template: // Every feature gate should add method here following this template:
// //
// // owner: @username // // owner: @username
// // alpha: v1.4 // // alpha: v1.4
// MyFeature featuregate.Feature = "MyFeature" // MyFeature featuregate.Feature = "MyFeature"
// //
// Feature gates should be listed in alphabetical, case-sensitive // Feature gates should be listed in alphabetical, case-sensitive
// (upper before any lower case character) order. This reduces the risk // (upper before any lower case character) order. This reduces the risk
// of code conflicts because changes are more likely to be scattered // of code conflicts because changes are more likely to be scattered
// across the file. // across the file.
// owner: @khenidak
// alpha: v1.15
//
// Enables ipv6 dual stack
// Original copy from k8s.io/kubernetes/pkg/features/kube_features.go
IPv6DualStack featuregate.Feature = "IPv6DualStack"
) )
func SetupCurrentKubernetesSpecificFeatureGates(featuregates featuregate.MutableFeatureGate) error { func SetupCurrentKubernetesSpecificFeatureGates(featuregates featuregate.MutableFeatureGate) error {
@ -46,6 +39,4 @@ func SetupCurrentKubernetesSpecificFeatureGates(featuregates featuregate.Mutable
// cloudPublicFeatureGates consists of cloud-specific feature keys. // 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. // 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{}
IPv6DualStack: {Default: true, PreRelease: featuregate.GA, LockToDefault: true},
}