diff --git a/libcalico-go/Makefile b/libcalico-go/Makefile index a1dc7c688a7..2b83bcfc82c 100644 --- a/libcalico-go/Makefile +++ b/libcalico-go/Makefile @@ -6,8 +6,12 @@ LOCAL_CHECKS = check-gen-files KIND_CONFIG = $(KIND_DIR)/kind-single.config -NETPOL_CNP_TAG = main -NETPOL_CNP_CRD_URL = https://raw.githubusercontent.com/kubernetes-sigs/network-policy-api/refs/heads/$(NETPOL_CNP_TAG)/config/crd/standard +# For a branch/tag use this format: +# NETPOL_CNP_REF = refs/heads/main +# For a commit, just use the commit ID: +# NETPOL_CNP_REF = +NETPOL_CNP_REF = 1f80acbe25809162f3f81ffa254eb24318ea387b +NETPOL_CNP_CRD_URL = https://raw.githubusercontent.com/kubernetes-sigs/network-policy-api/$(NETPOL_CNP_REF)/config/crd/standard NETPOL_CNP_CRD = policy.networking.k8s.io_clusternetworkpolicies.yaml ############################################################################### diff --git a/libcalico-go/config/crd/policy.networking.k8s.io_clusternetworkpolicies.yaml b/libcalico-go/config/crd/policy.networking.k8s.io_clusternetworkpolicies.yaml index d3a15b426b9..cced723679c 100644 --- a/libcalico-go/config/crd/policy.networking.k8s.io_clusternetworkpolicies.yaml +++ b/libcalico-go/config/crd/policy.networking.k8s.io_clusternetworkpolicies.yaml @@ -137,7 +137,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -182,7 +182,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -227,7 +227,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -752,7 +752,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -797,7 +797,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -842,7 +842,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: diff --git a/manifests/calico-bpf.yaml b/manifests/calico-bpf.yaml index 48ad230e420..f90e264be2a 100644 --- a/manifests/calico-bpf.yaml +++ b/manifests/calico-bpf.yaml @@ -5050,7 +5050,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5095,7 +5095,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5140,7 +5140,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5665,7 +5665,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5710,7 +5710,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5755,7 +5755,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: diff --git a/manifests/calico-policy-only.yaml b/manifests/calico-policy-only.yaml index 1046ae36c65..fa00b6c94cd 100644 --- a/manifests/calico-policy-only.yaml +++ b/manifests/calico-policy-only.yaml @@ -5060,7 +5060,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5105,7 +5105,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5150,7 +5150,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5675,7 +5675,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5720,7 +5720,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5765,7 +5765,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: diff --git a/manifests/calico-typha.yaml b/manifests/calico-typha.yaml index 782058f63df..f3c331d7848 100644 --- a/manifests/calico-typha.yaml +++ b/manifests/calico-typha.yaml @@ -5061,7 +5061,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5106,7 +5106,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5151,7 +5151,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5676,7 +5676,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5721,7 +5721,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5766,7 +5766,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: diff --git a/manifests/calico-vxlan.yaml b/manifests/calico-vxlan.yaml index 165a8e6dd28..b911de98349 100644 --- a/manifests/calico-vxlan.yaml +++ b/manifests/calico-vxlan.yaml @@ -5045,7 +5045,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5090,7 +5090,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5135,7 +5135,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5660,7 +5660,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5705,7 +5705,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5750,7 +5750,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: diff --git a/manifests/calico.yaml b/manifests/calico.yaml index d8075af40e8..e140926f785 100644 --- a/manifests/calico.yaml +++ b/manifests/calico.yaml @@ -5045,7 +5045,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5090,7 +5090,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5135,7 +5135,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5660,7 +5660,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5705,7 +5705,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5750,7 +5750,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: diff --git a/manifests/canal.yaml b/manifests/canal.yaml index 4bcb1cfce7e..78255c3fe2c 100644 --- a/manifests/canal.yaml +++ b/manifests/canal.yaml @@ -5062,7 +5062,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5107,7 +5107,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5152,7 +5152,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5677,7 +5677,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5722,7 +5722,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5767,7 +5767,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: diff --git a/manifests/crds.yaml b/manifests/crds.yaml index ae7e7ad3f3e..3d9c325a2af 100644 --- a/manifests/crds.yaml +++ b/manifests/crds.yaml @@ -4959,7 +4959,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5004,7 +5004,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5049,7 +5049,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5574,7 +5574,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5619,7 +5619,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5664,7 +5664,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: diff --git a/manifests/flannel-migration/calico.yaml b/manifests/flannel-migration/calico.yaml index 27f7a7252f1..8b3c108b48f 100644 --- a/manifests/flannel-migration/calico.yaml +++ b/manifests/flannel-migration/calico.yaml @@ -5045,7 +5045,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5090,7 +5090,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5135,7 +5135,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5660,7 +5660,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5705,7 +5705,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -5750,7 +5750,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: diff --git a/manifests/operator-crds.yaml b/manifests/operator-crds.yaml index f74dd899a42..6786fb9e2f4 100644 --- a/manifests/operator-crds.yaml +++ b/manifests/operator-crds.yaml @@ -36964,7 +36964,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -37009,7 +37009,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -37054,7 +37054,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -37579,7 +37579,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -37624,7 +37624,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: @@ -37669,7 +37669,7 @@ spec: type: integer range: description: - Range defines a continguous range + Range defines a contiguous range of ports. properties: end: