github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove flag cidr max size validation if gate enable

Browse Source
This commit is contained in:
Antonio Ojea
2023-10-28 19:25:19 +02:00
committed by Antonio Ojea
parent 8182c4d9ec
commit e3a0df26a8
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/kube-apiserver/app/options/validation.go
View File

@@ -37,9 +37,6 @@ func validateClusterIPFlags(options Extra) []error {
var errs []error var errs []error
// maxCIDRBits is used to define the maximum CIDR size for the cluster ip(s) // maxCIDRBits is used to define the maximum CIDR size for the cluster ip(s)
maxCIDRBits := 20 maxCIDRBits := 20
if utilfeature.DefaultFeatureGate.Enabled(features.MultiCIDRServiceAllocator) {
maxCIDRBits = 64
}
// validate that primary has been processed by user provided values or it has been defaulted // validate that primary has been processed by user provided values or it has been defaulted
if options.PrimaryServiceClusterIPRange.IP == nil { if options.PrimaryServiceClusterIPRange.IP == nil {
@@ -51,10 +48,12 @@ func validateClusterIPFlags(options Extra) []error {
errs = append(errs, errors.New("--service-cluster-ip-range must not contain more than two entries")) errs = append(errs, errors.New("--service-cluster-ip-range must not contain more than two entries"))
} }
// Complete() expected to have set Primary* and Secondary* // Complete() expected to have set Primary* and Secondary
// primary CIDR validation if !utilfeature.DefaultFeatureGate.Enabled(features.MultiCIDRServiceAllocator) {
if err := validateMaxCIDRRange(options.PrimaryServiceClusterIPRange, maxCIDRBits, "--service-cluster-ip-range"); err != nil { // primary CIDR validation
errs = append(errs, err) if err := validateMaxCIDRRange(options.PrimaryServiceClusterIPRange, maxCIDRBits, "--service-cluster-ip-range"); err != nil {
errs = append(errs, err)
}
} }
secondaryServiceClusterIPRangeUsed := (options.SecondaryServiceClusterIPRange.IP != nil) secondaryServiceClusterIPRangeUsed := (options.SecondaryServiceClusterIPRange.IP != nil)
@@ -72,9 +71,10 @@ func validateClusterIPFlags(options Extra) []error {
if !dualstack { if !dualstack {
errs = append(errs, errors.New("--service-cluster-ip-range[0] and --service-cluster-ip-range[1] must be of different IP family")) errs = append(errs, errors.New("--service-cluster-ip-range[0] and --service-cluster-ip-range[1] must be of different IP family"))
} }
if !utilfeature.DefaultFeatureGate.Enabled(features.MultiCIDRServiceAllocator) {
if err := validateMaxCIDRRange(options.SecondaryServiceClusterIPRange, maxCIDRBits, "--service-cluster-ip-range[1]"); err != nil { if err := validateMaxCIDRRange(options.SecondaryServiceClusterIPRange, maxCIDRBits, "--service-cluster-ip-range[1]"); err != nil {
errs = append(errs, err) errs = append(errs, err)
}
} }
} }

10
cmd/kube-apiserver/app/options/validation_test.go
View File

@@ -103,8 +103,8 @@ func TestClusterServiceIPRange(t *testing.T) {
gate: true, gate: true,
}, },
{ {
name: "service cidr IPv6 is too big despuite gate enbled", name: "service cidr IPv6 is too big and gate enbled",
expectErrors: true, expectErrors: false,
options: makeOptionsWithCIDRs("2001:db8::/12", ""), options: makeOptionsWithCIDRs("2001:db8::/12", ""),
gate: true, gate: true,
}, },
@@ -113,6 +113,12 @@ func TestClusterServiceIPRange(t *testing.T) {
expectErrors: true, expectErrors: true,
options: makeOptionsWithCIDRs("10.0.0.0/16", "3000::/64"), options: makeOptionsWithCIDRs("10.0.0.0/16", "3000::/64"),
}, },
{
name: "dual-stack secondary cidr too big gate enabled",
expectErrors: false,
options: makeOptionsWithCIDRs("10.0.0.0/16", "3000::/48"),
gate: true,
},
{ {
name: "more than two entries", name: "more than two entries",
expectErrors: true, expectErrors: true,