From ec1efc3b79cd23ae0f90c065bb8cf7bf43f7d56a Mon Sep 17 00:00:00 2001 From: SataQiu <1527062125@qq.com> Date: Fri, 10 Jul 2020 16:34:20 +0800 Subject: [PATCH] dual-stack: make nodeipam compatible with existing single-stack clusters when dual-stack feature gate become enabled by default Signed-off-by: SataQiu <1527062125@qq.com> --- cmd/kube-controller-manager/app/core.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/kube-controller-manager/app/core.go b/cmd/kube-controller-manager/app/core.go index c36a1069ee7..346006d3a84 100644 --- a/cmd/kube-controller-manager/app/core.go +++ b/cmd/kube-controller-manager/app/core.go @@ -156,13 +156,13 @@ func startNodeIpamController(ctx ControllerContext) (http.Handler, bool, error) } var nodeCIDRMaskSizeIPv4, nodeCIDRMaskSizeIPv6 int - if utilfeature.DefaultFeatureGate.Enabled(features.IPv6DualStack) { + if dualStack { // only --node-cidr-mask-size-ipv4 and --node-cidr-mask-size-ipv6 supported with dual stack clusters. // --node-cidr-mask-size flag is incompatible with dual stack clusters. nodeCIDRMaskSizeIPv4, nodeCIDRMaskSizeIPv6, err = setNodeCIDRMaskSizesDualStack(ctx.ComponentConfig.NodeIPAMController) } else { // only --node-cidr-mask-size supported with single stack clusters. - // --node-cidr-mask-size-ipv4 and --node-cidr-mask-size-ipv6 flags are incompatible with dual stack clusters. + // --node-cidr-mask-size-ipv4 and --node-cidr-mask-size-ipv6 flags are incompatible with single stack clusters. nodeCIDRMaskSizeIPv4, nodeCIDRMaskSizeIPv6, err = setNodeCIDRMaskSizes(ctx.ComponentConfig.NodeIPAMController) }