From 1dad7e110619f0998170b30cd2f9fac8e9b8b61d Mon Sep 17 00:00:00 2001 From: Mazdak Nasab Date: Thu, 12 Feb 2026 09:45:53 -0800 Subject: [PATCH 1/3] CNP: pick conformance improvements and enable it --- Makefile | 6 ++---- go.mod | 2 +- go.sum | 4 ++-- libcalico-go/Makefile | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index abfa8c4cff8..69c08aa2854 100644 --- a/Makefile +++ b/Makefile @@ -186,10 +186,8 @@ K8S_NETPOL_UNSUPPORTED_FEATURES ?= "" e2e-test: $(MAKE) -C e2e build $(MAKE) -C node kind-k8st-setup - $(MAKE) e2e-run-test - # Disabling k8s CNP conformance test since it's failing in Ubuntu22.04 and newer. - # It's been tracked in CORE-12206 task, and will be fixed seperately. - #$(MAKE) e2e-run-cnp-test + #$(MAKE) e2e-run-test + $(MAKE) e2e-run-cnp-test ## Create a kind cluster and run the ClusterNetworkPolicy specific e2e tests. e2e-test-clusternetworkpolicy: diff --git a/go.mod b/go.mod index a664ea9d4eb..211821fea34 100644 --- a/go.mod +++ b/go.mod @@ -120,7 +120,7 @@ require ( sigs.k8s.io/controller-runtime v0.22.3 sigs.k8s.io/kind v0.30.0 sigs.k8s.io/knftables v0.0.19 - sigs.k8s.io/network-policy-api v0.1.8-0.20260205105847-196cf8e0d449 + sigs.k8s.io/network-policy-api v0.1.8-0.20260212153203-412bf65729a5 sigs.k8s.io/yaml v1.6.0 ) diff --git a/go.sum b/go.sum index 97f16260ea3..fd015e263c6 100644 --- a/go.sum +++ b/go.sum @@ -1087,8 +1087,8 @@ sigs.k8s.io/kustomize/api v0.20.1 h1:iWP1Ydh3/lmldBnH/S5RXgT98vWYMaTUL1ADcr+Sv7I sigs.k8s.io/kustomize/api v0.20.1/go.mod h1:t6hUFxO+Ph0VxIk1sKp1WS0dOjbPCtLJ4p8aADLwqjM= sigs.k8s.io/kustomize/kyaml v0.20.1 h1:PCMnA2mrVbRP3NIB6v9kYCAc38uvFLVs8j/CD567A78= sigs.k8s.io/kustomize/kyaml v0.20.1/go.mod h1:0EmkQHRUsJxY8Ug9Niig1pUMSCGHxQ5RklbpV/Ri6po= -sigs.k8s.io/network-policy-api v0.1.8-0.20260205105847-196cf8e0d449 h1:PLQPDVCmIitKwwC16gD13TqT2lgHnUrz51g68IVpWcQ= -sigs.k8s.io/network-policy-api v0.1.8-0.20260205105847-196cf8e0d449/go.mod h1:xYIHRc47QPAIiPkl+oXfu5we8jACNlt7WuKc7ZP0sGU= +sigs.k8s.io/network-policy-api v0.1.8-0.20260212153203-412bf65729a5 h1:ps2rsHCZp0GDQCit54NO7Zg5QoFc7RYv5m0ukgmtyVE= +sigs.k8s.io/network-policy-api v0.1.8-0.20260212153203-412bf65729a5/go.mod h1:xYIHRc47QPAIiPkl+oXfu5we8jACNlt7WuKc7ZP0sGU= sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= sigs.k8s.io/structured-merge-diff/v6 v6.3.0 h1:jTijUJbW353oVOd9oTlifJqOGEkUw2jB/fXCbTiQEco= diff --git a/libcalico-go/Makefile b/libcalico-go/Makefile index 8b19f027d0c..f06a1e99a0f 100644 --- a/libcalico-go/Makefile +++ b/libcalico-go/Makefile @@ -10,7 +10,7 @@ KIND_CONFIG = $(KIND_DIR)/kind-single.config # NETPOL_CNP_REF = refs/heads/main # For a commit, just use the commit ID: # NETPOL_CNP_REF = -NETPOL_CNP_REF = 196cf8e0d449e108f4bb36cb97e127a37d24e428 +NETPOL_CNP_REF = 412bf65729a56bc9f0569a5e5a95685ac22350d9 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 From 5cd453eeb6fe6f566635a87f6fcb46757acd8abc Mon Sep 17 00:00:00 2001 From: Mazdak Nasab Date: Thu, 12 Feb 2026 10:07:45 -0800 Subject: [PATCH 2/3] make genreate --- apiserver/deps.txt | 2 +- app-policy/deps.txt | 2 +- calicoctl/deps.txt | 2 +- cni-plugin/deps.txt | 2 +- confd/deps.txt | 2 +- e2e/deps.txt | 2 +- felix/deps.txt | 2 +- hack/deps.txt | 2 +- kube-controllers/deps.txt | 2 +- libcalico-go/deps.txt | 2 +- node/deps.txt | 2 +- typha/deps.txt | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apiserver/deps.txt b/apiserver/deps.txt index f9addc96342..9db988bc56d 100644 --- a/apiserver/deps.txt +++ b/apiserver/deps.txt @@ -112,7 +112,7 @@ k8s.io/kubernetes v1.34.3 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 -sigs.k8s.io/network-policy-api v0.1.8-0.20260205105847-196cf8e0d449 +sigs.k8s.io/network-policy-api v0.1.8-0.20260212153203-412bf65729a5 sigs.k8s.io/randfill v1.0.0 sigs.k8s.io/structured-merge-diff/v6 v6.3.0 sigs.k8s.io/yaml v1.6.0 diff --git a/app-policy/deps.txt b/app-policy/deps.txt index 7edd716cec4..260ae580feb 100644 --- a/app-policy/deps.txt +++ b/app-policy/deps.txt @@ -110,7 +110,7 @@ k8s.io/kubernetes v1.34.3 k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 sigs.k8s.io/knftables v0.0.19 -sigs.k8s.io/network-policy-api v0.1.8-0.20260205105847-196cf8e0d449 +sigs.k8s.io/network-policy-api v0.1.8-0.20260212153203-412bf65729a5 sigs.k8s.io/randfill v1.0.0 sigs.k8s.io/structured-merge-diff/v6 v6.3.0 sigs.k8s.io/yaml v1.6.0 diff --git a/calicoctl/deps.txt b/calicoctl/deps.txt index 24b599237fd..793515c541b 100644 --- a/calicoctl/deps.txt +++ b/calicoctl/deps.txt @@ -83,7 +83,7 @@ k8s.io/klog/v2 v2.130.1 k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 -sigs.k8s.io/network-policy-api v0.1.8-0.20260205105847-196cf8e0d449 +sigs.k8s.io/network-policy-api v0.1.8-0.20260212153203-412bf65729a5 sigs.k8s.io/randfill v1.0.0 sigs.k8s.io/structured-merge-diff/v6 v6.3.0 sigs.k8s.io/yaml v1.6.0 diff --git a/cni-plugin/deps.txt b/cni-plugin/deps.txt index b76da7449fc..d8823c3db88 100644 --- a/cni-plugin/deps.txt +++ b/cni-plugin/deps.txt @@ -96,7 +96,7 @@ k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 sigs.k8s.io/knftables v0.0.19 -sigs.k8s.io/network-policy-api v0.1.8-0.20260205105847-196cf8e0d449 +sigs.k8s.io/network-policy-api v0.1.8-0.20260212153203-412bf65729a5 sigs.k8s.io/randfill v1.0.0 sigs.k8s.io/structured-merge-diff/v6 v6.3.0 sigs.k8s.io/yaml v1.6.0 diff --git a/confd/deps.txt b/confd/deps.txt index be33d1f118f..80350e5819c 100644 --- a/confd/deps.txt +++ b/confd/deps.txt @@ -79,7 +79,7 @@ k8s.io/klog/v2 v2.130.1 k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 -sigs.k8s.io/network-policy-api v0.1.8-0.20260205105847-196cf8e0d449 +sigs.k8s.io/network-policy-api v0.1.8-0.20260212153203-412bf65729a5 sigs.k8s.io/randfill v1.0.0 sigs.k8s.io/structured-merge-diff/v6 v6.3.0 sigs.k8s.io/yaml v1.6.0 diff --git a/e2e/deps.txt b/e2e/deps.txt index 91db77eea77..f4c60555ca9 100644 --- a/e2e/deps.txt +++ b/e2e/deps.txt @@ -117,7 +117,7 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 sigs.k8s.io/controller-runtime v0.22.3 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 -sigs.k8s.io/network-policy-api v0.1.8-0.20260205105847-196cf8e0d449 +sigs.k8s.io/network-policy-api v0.1.8-0.20260212153203-412bf65729a5 sigs.k8s.io/randfill v1.0.0 sigs.k8s.io/structured-merge-diff/v6 v6.3.0 sigs.k8s.io/yaml v1.6.0 diff --git a/felix/deps.txt b/felix/deps.txt index c26be708802..4f6357795d3 100644 --- a/felix/deps.txt +++ b/felix/deps.txt @@ -150,7 +150,7 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 modernc.org/memory v1.11.0 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 sigs.k8s.io/knftables v0.0.19 -sigs.k8s.io/network-policy-api v0.1.8-0.20260205105847-196cf8e0d449 +sigs.k8s.io/network-policy-api v0.1.8-0.20260212153203-412bf65729a5 sigs.k8s.io/randfill v1.0.0 sigs.k8s.io/structured-merge-diff/v6 v6.3.0 sigs.k8s.io/yaml v1.6.0 diff --git a/hack/deps.txt b/hack/deps.txt index 815d2c1c858..9e959b4c836 100644 --- a/hack/deps.txt +++ b/hack/deps.txt @@ -81,7 +81,7 @@ k8s.io/klog/v2 v2.130.1 k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 -sigs.k8s.io/network-policy-api v0.1.8-0.20260205105847-196cf8e0d449 +sigs.k8s.io/network-policy-api v0.1.8-0.20260212153203-412bf65729a5 sigs.k8s.io/randfill v1.0.0 sigs.k8s.io/structured-merge-diff/v6 v6.3.0 sigs.k8s.io/yaml v1.6.0 diff --git a/kube-controllers/deps.txt b/kube-controllers/deps.txt index 437a10e4932..dea73fc1d9d 100644 --- a/kube-controllers/deps.txt +++ b/kube-controllers/deps.txt @@ -123,7 +123,7 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 sigs.k8s.io/controller-runtime v0.22.3 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 sigs.k8s.io/knftables v0.0.19 -sigs.k8s.io/network-policy-api v0.1.8-0.20260205105847-196cf8e0d449 +sigs.k8s.io/network-policy-api v0.1.8-0.20260212153203-412bf65729a5 sigs.k8s.io/randfill v1.0.0 sigs.k8s.io/structured-merge-diff/v6 v6.3.0 sigs.k8s.io/yaml v1.6.0 diff --git a/libcalico-go/deps.txt b/libcalico-go/deps.txt index ae464dfdae9..417a8367c8e 100644 --- a/libcalico-go/deps.txt +++ b/libcalico-go/deps.txt @@ -94,7 +94,7 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 sigs.k8s.io/controller-runtime v0.22.3 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 sigs.k8s.io/kind v0.30.0 -sigs.k8s.io/network-policy-api v0.1.8-0.20260205105847-196cf8e0d449 +sigs.k8s.io/network-policy-api v0.1.8-0.20260212153203-412bf65729a5 sigs.k8s.io/randfill v1.0.0 sigs.k8s.io/structured-merge-diff/v6 v6.3.0 sigs.k8s.io/yaml v1.6.0 diff --git a/node/deps.txt b/node/deps.txt index 8631eb77242..27ebf5ef487 100644 --- a/node/deps.txt +++ b/node/deps.txt @@ -151,7 +151,7 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 modernc.org/memory v1.11.0 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 sigs.k8s.io/knftables v0.0.19 -sigs.k8s.io/network-policy-api v0.1.8-0.20260205105847-196cf8e0d449 +sigs.k8s.io/network-policy-api v0.1.8-0.20260212153203-412bf65729a5 sigs.k8s.io/randfill v1.0.0 sigs.k8s.io/structured-merge-diff/v6 v6.3.0 sigs.k8s.io/yaml v1.6.0 diff --git a/typha/deps.txt b/typha/deps.txt index 6891f591c02..9fc38b26923 100644 --- a/typha/deps.txt +++ b/typha/deps.txt @@ -84,7 +84,7 @@ k8s.io/klog/v2 v2.130.1 k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 -sigs.k8s.io/network-policy-api v0.1.8-0.20260205105847-196cf8e0d449 +sigs.k8s.io/network-policy-api v0.1.8-0.20260212153203-412bf65729a5 sigs.k8s.io/randfill v1.0.0 sigs.k8s.io/structured-merge-diff/v6 v6.3.0 sigs.k8s.io/yaml v1.6.0 From 41b2ba924c5fec815669276e9e61e34f362ab14d Mon Sep 17 00:00:00 2001 From: Mazdak Nasab Date: Thu, 12 Feb 2026 11:14:17 -0800 Subject: [PATCH 3/3] enable e2e --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 69c08aa2854..34d5cb0a1ea 100644 --- a/Makefile +++ b/Makefile @@ -186,7 +186,7 @@ K8S_NETPOL_UNSUPPORTED_FEATURES ?= "" e2e-test: $(MAKE) -C e2e build $(MAKE) -C node kind-k8st-setup - #$(MAKE) e2e-run-test + $(MAKE) e2e-run-test $(MAKE) e2e-run-cnp-test ## Create a kind cluster and run the ClusterNetworkPolicy specific e2e tests.