Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-48089: validate hostPrefix to be the same when multiple clusternetwork CIDRs are present #9398

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+49 −7
Open

OCPBUGS-48089: validate hostPrefix to be the same when multiple clusternetwork CIDRs are present #9398

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1f9403
OCPBUGS-48089: validate hostPrefix to be the same when multiple
tthvo Jan 24, 2025
8c9b001
docs: mention the restriction for hostPrefix in InstallConfig CRD
tthvo Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions pkg/types/validation/installconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,13 +502,22 @@ func validateClusterNetwork(n *types.Networking, cn *types.ClusterNetworkEntry,
allErrs = append(allErrs, field.Invalid(fldPath.Child("cidr"), cn.CIDR.String(), fmt.Sprintf("cluster network must not overlap with cluster network %d", i)))
}
}
if cn.HostPrefix < 0 {
allErrs = append(allErrs, field.Invalid(fldPath.Child("hostPrefix"), cn.HostPrefix, "hostPrefix must be positive"))
}

// ignore hostPrefix if the plugin does not use it and has it unset
if pluginsUsingHostPrefix.Has(n.NetworkType) || (cn.HostPrefix != 0) {
if ones, bits := cn.CIDR.Mask.Size(); cn.HostPrefix < int32(ones) {
if cn.HostPrefix < 0 {
allErrs = append(allErrs, field.Invalid(fldPath.Child("hostPrefix"), cn.HostPrefix, "hostPrefix must be positive"))
} else if ones, bits := cn.CIDR.Mask.Size(); cn.HostPrefix < int32(ones) {
allErrs = append(allErrs, field.Invalid(fldPath.Child("hostPrefix"), cn.HostPrefix, "cluster network host subnetwork prefix must not be larger size than CIDR "+cn.CIDR.String()))
} else if bits == 32 {
// setting different value for clusternetwork CIDR host prefix is not allowed
// we only need to check IPv4 as IPv6 prefix must be 64
for _, acn := range n.ClusterNetwork[0:idx] {
if acn.CIDR.IP.To4() != nil && cn.HostPrefix != acn.HostPrefix {
allErrs = append(allErrs, field.Invalid(fldPath.Child("hostPrefix"), cn.HostPrefix, "cluster network host subnetwork prefix must be the same value for IPv4 networks"))
break
}
}
} else if bits == 128 && cn.HostPrefix != 64 {
allErrs = append(allErrs, field.Invalid(fldPath.Child("hostPrefix"), cn.HostPrefix, "cluster network host subnetwork prefix must be 64 for IPv6 networks"))
}
Expand Down
31 changes: 29 additions & 2 deletions pkg/types/validation/installconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,8 +516,8 @@ func TestValidateInstallConfig(t *testing.T) {
installConfig: func() *types.InstallConfig {
c := validInstallConfig()
c.Networking.ClusterNetwork = []types.ClusterNetworkEntry{
{CIDR: *ipnet.MustParseCIDR("12.0.0.0/16"), HostPrefix: 23},
{CIDR: *ipnet.MustParseCIDR("12.0.3.0/24"), HostPrefix: 25},
{CIDR: *ipnet.MustParseCIDR("12.0.0.0/16"), HostPrefix: 28},
{CIDR: *ipnet.MustParseCIDR("12.0.3.0/24"), HostPrefix: 28},
}
return c
}(),
Expand Down Expand Up @@ -554,6 +554,33 @@ func TestValidateInstallConfig(t *testing.T) {
}(),
expectedError: ``,
},
{
name: "cluster network host prefix negative",
installConfig: func() *types.InstallConfig {
c := validInstallConfig()
c.Networking.ClusterNetwork[0].HostPrefix = -23
return c
}(),
expectedError: `^networking\.clusterNetwork\[0]\.hostPrefix: Invalid value: -23: hostPrefix must be positive$`,
},
{
name: "multiple cluster network host prefix different",
installConfig: func() *types.InstallConfig {
c := validInstallConfig()
c.Networking.ClusterNetwork = append(c.Networking.ClusterNetwork,
types.ClusterNetworkEntry{
CIDR: *ipnet.MustParseCIDR("192.168.2.0/24"),
HostPrefix: 30,
},
types.ClusterNetworkEntry{
CIDR: *ipnet.MustParseCIDR("ffd2::/48"),
HostPrefix: 64,
},
patrickdillon marked this conversation as resolved.
Show resolved Hide resolved
)
return c
}(),
expectedError: `^networking\.clusterNetwork\[1]\.hostPrefix: Invalid value: 30: cluster network host subnetwork prefix must be the same value for IPv4 networks$`,
},
{
name: "networking clusterNetworkMTU - valid high limit ovn",
installConfig: func() *types.InstallConfig {
Expand Down