Allow multiple node cidr masks in cm

update tests

add comment

amend var name

update comment

add check for empty slice

fix tests

fix mask size in test

review feedback

add ipv4 and ipv6 flag for mask sizes

add to violation exception list

remove import alias

run update-openapi-spec

review feedback

run update-bazel

review feedback

review feedback

Kubernetes-commit: 796faba4ac96db07194c4811585abe52fd682064
This commit is contained in:
Anish Ramasekar 2019-07-09 14:47:01 -07:00 committed by Kubernetes Publisher
parent b4ecf16d6e
commit 832b224673
1 changed files with 4 additions and 0 deletions

View File

@ -382,6 +382,10 @@ type NodeIPAMControllerConfiguration struct {
SecondaryServiceCIDR string SecondaryServiceCIDR string
// NodeCIDRMaskSize is the mask size for node cidr in cluster. // NodeCIDRMaskSize is the mask size for node cidr in cluster.
NodeCIDRMaskSize int32 NodeCIDRMaskSize int32
// NodeCIDRMaskSizeIPv4 is the mask size for node cidr in dual-stack cluster.
NodeCIDRMaskSizeIPv4 int32
// NodeCIDRMaskSizeIPv6 is the mask size for node cidr in dual-stack cluster.
NodeCIDRMaskSizeIPv6 int32
} }
// NodeLifecycleControllerConfiguration contains elements describing NodeLifecycleController. // NodeLifecycleControllerConfiguration contains elements describing NodeLifecycleController.