Skip to content

Commit a26c34e

Browse files
authored
Merge pull request kubernetes#90381 from cici37/features
Remove CCM's dependency: pkg/features
2 parents 3c082d5 + 722ab79 commit a26c34e

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

cmd/cloud-controller-manager/app/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ go_library(
1515
"//pkg/controller/cloud:go_default_library",
1616
"//pkg/controller/route:go_default_library",
1717
"//pkg/controller/service:go_default_library",
18-
"//pkg/features:go_default_library",
1918
"//pkg/util/configz:go_default_library",
2019
"//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
2120
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",

cmd/cloud-controller-manager/app/core.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,12 @@ import (
3535
netutils "k8s.io/utils/net"
3636

3737
utilfeature "k8s.io/apiserver/pkg/util/feature"
38-
kubefeatures "k8s.io/kubernetes/pkg/features"
38+
)
39+
40+
const (
41+
// IPv6DualStack enables ipv6 dual stack feature
42+
// Original copy from pkg/features/kube_features.go
43+
IPv6DualStack = "IPv6DualStack"
3944
)
4045

4146
func startCloudNodeController(ctx *cloudcontrollerconfig.CompletedConfig, cloud cloudprovider.Interface, stopCh <-chan struct{}) (http.Handler, bool, error) {
@@ -116,7 +121,7 @@ func startRouteController(ctx *cloudcontrollerconfig.CompletedConfig, cloud clou
116121
}
117122

118123
// failure: more than one cidr and dual stack is not enabled
119-
if len(clusterCIDRs) > 1 && !utilfeature.DefaultFeatureGate.Enabled(kubefeatures.IPv6DualStack) {
124+
if len(clusterCIDRs) > 1 && !utilfeature.DefaultFeatureGate.Enabled(IPv6DualStack) {
120125
return nil, false, fmt.Errorf("len of ClusterCIDRs==%v and dualstack feature is not enabled", len(clusterCIDRs))
121126
}
122127

0 commit comments

Comments
 (0)