CNP update tests

.github/workflows/conformance.yml

@@ -76,10 +76,9 @@ jobs:
     - name: Install kube-network-policies
       run: |
         # install CRDs
-        /usr/local/bin/kubectl apply -f ./config/crd/experimental/policy.networking.k8s.io_adminnetworkpolicies.yaml
-        /usr/local/bin/kubectl apply -f ./config/crd/experimental/policy.networking.k8s.io_baselineadminnetworkpolicies.yaml
+        /usr/local/bin/kubectl apply -f ./config/crd/experimental/policy.networking.k8s.io_clusternetworkpolicies.yaml
         # install kube-network-policies
-        /usr/local/bin/kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/kube-network-policies/v0.6.1/install-anp.yaml
+        /usr/local/bin/kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/kube-network-policies/e13ebef3765467da51d0a83435f804880f132a4e/install-cnp.yaml
 
     - name: Get Cluster status
       run: |
@@ -93,7 +92,7 @@ jobs:
     - name: Run tests
       run: |
         go mod download
-        go test  -v ./conformance -run TestConformanceProfiles -args --conformance-profiles=AdminNetworkPolicy,BaselineAdminNetworkPolicy --organization=kubernetes --project=kube-network-policies --url=https://github.com/kubernetes-sigs/kube-network-policies --version=0.6.1 [email protected] --additional-info=https://github.com/kubernetes-sigs/kube-network-policies
+        go test  -v ./conformance -run TestConformanceProfiles -args --conformance-profiles=ClusterNetworkPolicy --organization=kubernetes --project=kube-network-policies --url=https://github.com/kubernetes-sigs/kube-network-policies --version=0.6.1 [email protected] --additional-info=https://github.com/kubernetes-sigs/kube-network-policies
 
     - name: Upload Junit Reports
       if: always()

config/crd/experimental/kustomization.yaml

@@ -2,8 +2,7 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- policy.networking.k8s.io_adminnetworkpolicies.yaml
-- policy.networking.k8s.io_baselineadminnetworkpolicies.yaml
+- policy.networking.k8s.io_clusternetworkpolicies.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.

config/crd/standard/kustomization.yaml

@@ -2,8 +2,7 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- policy.networking.k8s.io_adminnetworkpolicies.yaml
-- policy.networking.k8s.io_baselineadminnetworkpolicies.yaml
+- policy.networking.k8s.io_clusternetworkpolicies.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.

conformance/apis/v1alpha1/profilereport.go

@@ -20,7 +20,7 @@ package v1alpha1
 // named conformance profile.
 type ProfileReport struct {
 	// Name indicates the name of the conformance profile
-	// (e.g. "AdminNetworkPolicy", "BaselineAdminNetworkPolicy")
+	// (e.g. "ClusterNetworkPolicy", "AdminNetworkPolicy", "BaselineAdminNetworkPolicy")
 	Name string `json:"name"`
 
 	// Standard indicates the standard support level which includes the set of tests

conformance/base/admin_network_policy/experimental-egress-selector-rules.yaml → conformance/base/admin_tier/experimental-egress-selector-rules.yaml

@@ -1,8 +1,9 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: AdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: node-and-cidr-as-peers-example
 spec:
+  tier: Admin
   priority: 75
   subject:
     pods:

conformance/base/admin_network_policy/standard-egress-inline-cidr-rules.yaml → conformance/base/admin_tier/standard-egress-inline-cidr-rules.yaml

@@ -1,8 +1,9 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: AdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: inline-cidr-as-peers-example
 spec:
+  tier: Admin
   priority: 85
   subject:
     pods:

conformance/base/admin_network_policy/standard-egress-sctp-rules.yaml → conformance/base/admin_tier/standard-egress-sctp-rules.yaml

@@ -1,8 +1,9 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: AdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: egress-sctp
 spec:
+  tier: Admin
   priority: 8
   subject:
     namespaces:

conformance/base/admin_network_policy/standard-egress-tcp-rules.yaml → conformance/base/admin_tier/standard-egress-tcp-rules.yaml

@@ -1,8 +1,9 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: AdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: egress-tcp
 spec:
+  tier: Admin
   priority: 6
   subject:
     namespaces:

conformance/base/admin_network_policy/standard-egress-udp-rules.yaml → conformance/base/admin_tier/standard-egress-udp-rules.yaml

@@ -1,8 +1,9 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: AdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: egress-udp
 spec:
+  tier: Admin
   priority: 7
   subject:
     namespaces:

conformance/base/admin_network_policy/standard-gress-rules-combined.yaml → conformance/base/admin_tier/standard-gress-rules-combined.yaml

@@ -1,8 +1,9 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: AdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: gress-rules
 spec:
+  tier: Admin
   priority: 15
   subject:
     namespaces:

conformance/base/admin_network_policy/standard-ingress-sctp-rules.yaml → conformance/base/admin_tier/standard-ingress-sctp-rules.yaml

@@ -1,8 +1,9 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: AdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: ingress-sctp
 spec:
+  tier: Admin
   priority: 5
   subject:
     namespaces:

conformance/base/admin_network_policy/standard-ingress-tcp-rules.yaml → conformance/base/admin_tier/standard-ingress-tcp-rules.yaml

@@ -1,8 +1,9 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: AdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: ingress-tcp
 spec:
+  tier: Admin
   priority: 3
   subject:
     namespaces:

conformance/base/admin_network_policy/standard-ingress-udp-rules.yaml → conformance/base/admin_tier/standard-ingress-udp-rules.yaml

@@ -1,8 +1,9 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: AdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: ingress-udp
 spec:
+  tier: Admin
   priority: 4
   subject:
     namespaces:

conformance/base/admin_network_policy/standard-priority-field.yaml → conformance/base/admin_tier/standard-priority-field.yaml

@@ -1,8 +1,9 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: AdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: priority-50-example
 spec:
+  tier: Admin
   priority: 50
   subject:
     pods:
@@ -35,11 +36,12 @@ spec:
           matchLabels:
             conformance-house: slytherin
 ---
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: AdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: old-priority-60-new-priority-40-example
 spec:
+  tier: Admin
   priority: 60 # will be updated to 40 in the tests thus taking higher precedence over the deny at priority 50
   subject:
     pods:
@@ -72,11 +74,13 @@ spec:
           matchLabels:
             conformance-house: slytherin
 ---
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: BaselineAdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: default
 spec:
+  tier: Baseline
+  priority: 10
   subject:
     pods:
       namespaceSelector:

conformance/base/api_integration/standard-anp-np-banp.yaml

@@ -1,8 +1,9 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: AdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: pass-example
 spec:
+  tier: Admin
   priority: 10
   subject:
     namespaces:
@@ -44,11 +45,13 @@ spec:
         matchLabels:
           conformance-house: slytherin
 ---
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: BaselineAdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: default
 spec:
+  tier: Baseline
+  priority: 10
   subject:
     namespaces:
       matchLabels:

conformance/base/baseline_admin_network_policy/experimental-egress-selector-rules.yaml → conformance/base/baseline_tier/experimental-egress-selector-rules.yaml

@@ -1,8 +1,10 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: BaselineAdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: default
 spec:
+  tier: Baseline
+  priority: 10
   subject:
     namespaces:
       matchLabels:

conformance/base/baseline_admin_network_policy/standard-egress-inline-cidr-rules.yaml → conformance/base/baseline_tier/standard-egress-inline-cidr-rules.yaml

@@ -1,8 +1,10 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: BaselineAdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: default
 spec:
+  tier: Baseline
+  priority: 10
   subject:
     namespaces:
       matchLabels:

conformance/base/baseline_admin_network_policy/standard-egress-sctp-rules.yaml → conformance/base/baseline_tier/standard-egress-sctp-rules.yaml

@@ -1,8 +1,10 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: BaselineAdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: default
 spec:
+  tier: Baseline
+  priority: 10
   subject:
     namespaces:
       matchLabels:

conformance/base/baseline_admin_network_policy/standard-egress-tcp-rules.yaml → conformance/base/baseline_tier/standard-egress-tcp-rules.yaml

@@ -1,8 +1,10 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: BaselineAdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: default
 spec:
+  tier: Baseline
+  priority: 10
   subject:
     namespaces:
       matchLabels:

conformance/base/baseline_admin_network_policy/standard-egress-udp-rules.yaml → conformance/base/baseline_tier/standard-egress-udp-rules.yaml

@@ -1,8 +1,10 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: BaselineAdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: default
 spec:
+  tier: Baseline
+  priority: 10
   subject:
     namespaces:
       matchLabels:

conformance/base/baseline_admin_network_policy/standard-gress-rules-combined.yaml → conformance/base/baseline_tier/standard-gress-rules-combined.yaml

@@ -1,8 +1,10 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: BaselineAdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: default
 spec:
+  tier: Baseline
+  priority: 10
   subject:
     namespaces:
       matchLabels:

conformance/base/baseline_admin_network_policy/standard-ingress-sctp-rules.yaml → conformance/base/baseline_tier/standard-ingress-sctp-rules.yaml

@@ -1,8 +1,10 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: BaselineAdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: default
 spec:
+  tier: Baseline
+  priority: 10
   subject:
     namespaces:
       matchLabels:

conformance/base/baseline_admin_network_policy/standard-ingress-tcp-rules.yaml → conformance/base/baseline_tier/standard-ingress-tcp-rules.yaml

@@ -1,8 +1,10 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: BaselineAdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: default
 spec:
+  tier: Baseline
+  priority: 10
   subject:
     namespaces:
       matchLabels:

conformance/base/baseline_admin_network_policy/standard-ingress-udp-rules.yaml → conformance/base/baseline_tier/standard-ingress-udp-rules.yaml

@@ -1,8 +1,10 @@
-apiVersion: policy.networking.k8s.io/v1alpha1
-kind: BaselineAdminNetworkPolicy
+apiVersion: policy.networking.k8s.io/v1alpha2
+kind: ClusterNetworkPolicy
 metadata:
   name: default
 spec:
+  tier: Baseline
+  priority: 10
   subject:
     namespaces:
       matchLabels:

conformance/conformance_profile_test.go

@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 	"sigs.k8s.io/yaml"
 
-	"sigs.k8s.io/network-policy-api/apis/v1alpha1"
+	"sigs.k8s.io/network-policy-api/apis/v1alpha2"
 	confv1a1 "sigs.k8s.io/network-policy-api/conformance/apis/v1alpha1"
 	"sigs.k8s.io/network-policy-api/conformance/tests"
 	"sigs.k8s.io/network-policy-api/conformance/utils/flags"
@@ -67,7 +67,10 @@ func TestConformanceProfiles(t *testing.T) {
 		t.Fatalf("error when creating Kubernetes ClientSet: %v", err)
 	}
 
-	v1alpha1.Install(c.Scheme())
+	err = v1alpha2.Install(c.Scheme())
+	if err != nil {
+		t.Fatalf("Error installing v1alpha2 scheme: %v", err)
+	}
 
 	// standard conformance flags
 	supportedFeatures = suite.ParseSupportedFeatures(*flags.SupportedFeatures)

conformance/conformance_test.go

@@ -26,7 +26,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 
-	"sigs.k8s.io/network-policy-api/apis/v1alpha1"
+	"sigs.k8s.io/network-policy-api/apis/v1alpha2"
 	"sigs.k8s.io/network-policy-api/conformance/tests"
 	"sigs.k8s.io/network-policy-api/conformance/utils/flags"
 	"sigs.k8s.io/network-policy-api/conformance/utils/suite"
@@ -51,7 +51,10 @@ func TestConformance(t *testing.T) {
 		t.Fatalf("error when creating Kubernetes ClientSet: %v", err)
 	}
 
-	v1alpha1.Install(c.Scheme())
+	err = v1alpha2.Install(c.Scheme())
+	if err != nil {
+		t.Fatalf("Error installing v1alpha2 scheme: %v", err)
+	}
 
 	supportedFeatures := suite.ParseSupportedFeatures(*flags.SupportedFeatures)
 	exemptFeatures := suite.ParseSupportedFeatures(*flags.ExemptFeatures)