Merge pull request kubernetes#85500 from aramase/fix-85491

k8s-ci-robot · web-flow · commit d50717d0616f · 2019-11-23T12:09:50.000-08:00
Set node cidr mask size ipv4/ipv6 config
diff --git a/cmd/kube-controller-manager/app/options/nodeipamcontroller.go b/cmd/kube-controller-manager/app/options/nodeipamcontroller.go
@@ -57,6 +57,8 @@ func (o *NodeIPAMControllerOptions) ApplyTo(cfg *nodeipamconfig.NodeIPAMControll
 	}
 
 	cfg.NodeCIDRMaskSize = o.NodeCIDRMaskSize
+	cfg.NodeCIDRMaskSizeIPv4 = o.NodeCIDRMaskSizeIPv4
+	cfg.NodeCIDRMaskSizeIPv6 = o.NodeCIDRMaskSizeIPv6
 
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,8 @@ func (o NodeIPAMControllerOptions) ApplyTo(cfg nodeipamconfig.NodeIPAMControll`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`cfg.NodeCIDRMaskSize = o.NodeCIDRMaskSize`
	`60`	`+ cfg.NodeCIDRMaskSizeIPv4 = o.NodeCIDRMaskSizeIPv4`
	`61`	`+ cfg.NodeCIDRMaskSizeIPv6 = o.NodeCIDRMaskSizeIPv6`
`60`	`62`
`61`	`63`	`return nil`
`62`	`64`	`}`