Skip to content

Fix validation of CIDR fields #324

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

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

Fix validation of CIDR fields #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08624fc
Fix validation of CIDR fields
danwinship Sep 24, 2025
f4c54cc
Update to current kind version for crd-e2e test
danwinship Jan 26, 2026
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
2 changes: 1 addition & 1 deletion apis/v1alpha1/shared_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,6 @@ type AdminNetworkPolicyIngressPeer struct {
}

// CIDR is an IP address range in CIDR notation (for example, "10.0.0.0/8" or "fd00::/8").
// +kubebuilder:validation:XValidation:rule="isCIDR(self)",message="Invalid CIDR format provided"
// +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self) == cidr(self).masked()",message="Invalid CIDR format provided"
// +kubebuilder:validation:MaxLength=43
type CIDR string
2 changes: 1 addition & 1 deletion apis/v1alpha2/clusternetworkpolicy_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ type PortRange struct {

// CIDR is an IP address range in CIDR notation
// (for example, "10.0.0.0/8" or "fd00::/8").
// +kubebuilder:validation:XValidation:rule="isCIDR(self)",message="Invalid CIDR format provided"
// +kubebuilder:validation:XValidation:rule="isCIDR(self) && cidr(self) == cidr(self).masked()",message="Invalid CIDR format provided"
// +kubebuilder:validation:MaxLength=43
type CIDR string

Expand Down
2 changes: 1 addition & 1 deletion config/crd/experimental/policy.networking.k8s.io_clusternetworkpolicies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ spec:
type: string
x-kubernetes-validations:
- message: Invalid CIDR format provided
rule: isCIDR(self)
rule: isCIDR(self) && cidr(self) == cidr(self).masked()
maxItems: 25
minItems: 1
type: array
Expand Down
2 changes: 1 addition & 1 deletion config/crd/standard/policy.networking.k8s.io_clusternetworkpolicies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ spec:
type: string
x-kubernetes-validations:
- message: Invalid CIDR format provided
rule: isCIDR(self)
rule: isCIDR(self) && cidr(self) == cidr(self).masked()
maxItems: 25
minItems: 1
type: array
Expand Down
2 changes: 1 addition & 1 deletion hack/crd-e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ trap cleanup INT TERM
res=0

# Install kind
(go install sigs.k8s.io/kind@v0.25.0) || res=$?
(go install sigs.k8s.io/kind@v0.31.0) || res=$?

# Create cluster
KIND_CREATE_ATTEMPTED=true
Expand Down
Loading