Merge pull request #307 from npinaeva/npep-285-test

CNP update tests

Author: k8s-ci-robot

.github/workflows/conformance.yml

@@ -16,7 +16,7 @@ env:
   KIND_VERSION: "v0.30.0"
   IMAGE_NAME: registry.k8s.io/networking/kube-network-policies
   KIND_CLUSTER_NAME: kind
-  NPAPI_VERSION: "v1alpha1"
+  NPAPI_VERSION: "v1alpha2"
 
 permissions: write-all
 
@@ -80,8 +80,7 @@ jobs:
 
     - name: Install network policy APIs
       run: |
-        /usr/local/bin/kubectl apply -f ./config/crd/standard/policy.networking.k8s.io_adminnetworkpolicies.yaml
-        /usr/local/bin/kubectl apply -f ./config/crd/standard/policy.networking.k8s.io_baselineadminnetworkpolicies.yaml
+        /usr/local/bin/kubectl apply -f ./config/crd/standard/policy.networking.k8s.io_clusternetworkpolicies.yaml
 
     - name: Install kube-network-policies from main
       run: |
@@ -98,8 +97,8 @@ jobs:
           # Preload the image in the kind cluster
           /usr/local/bin/kind load docker-image registry.k8s.io/networking/kube-network-policies:test-npa-${{ env.NPAPI_VERSION }} --name ${{ env.KIND_CLUSTER_NAME}}
           # Install kube-network-policies with the image built from main
-          sed -i s#registry.k8s.io/networking/kube-network-policies.*#registry.k8s.io/networking/kube-network-policies:test-npa-${{ env.NPAPI_VERSION }}# install-anp.yaml
-          /usr/local/bin/kubectl apply -f ./install-anp.yaml
+          sed -i s#registry.k8s.io/networking/kube-network-policies.*#registry.k8s.io/networking/kube-network-policies:test-npa-${{ env.NPAPI_VERSION }}# install-cnp.yaml
+          /usr/local/bin/kubectl apply -f ./install-cnp.yaml
         )
 
     - name: Get Cluster status
@@ -115,7 +114,7 @@ jobs:
       run: |
         go mod download
         REPO_VERSION=$(git describe --always --dirty)
-        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=${REPO_VERSION} --contact=antonio.ojea.garcia@gmail.com --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=${REPO_VERSION} --contact=https://github.com/kubernetes-sigs/kube-network-policies/issues/new --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/experimental/policy.networking.k8s.io_adminnetworkpolicies.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/experimental/policy.networking.k8s.io_baselineadminnetworkpolicies.yaml

@@ -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")
 	Name string `json:"name"`
 
 	// Standard indicates the standard support level which includes the set of tests

config/crd/standard/kustomization.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:
@@ -14,7 +15,7 @@ spec:
           conformance-house: gryffindor
   egress:
   - name: "allow-egress-to-36363-on-nodes"
-    action: "Allow"
+    action: "Accept"
     to:
     - nodes:
         matchLabels:

config/crd/standard/policy.networking.k8s.io_adminnetworkpolicies.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:
@@ -15,13 +16,13 @@ spec:
   egress:
   # CIDR rules that test allow to specific IPs is done within the test by updating the CR
   #- name: "allow-egress-to-specific-podIPs"
-  #  action: "Allow"
+  #  action: "Accept"
   #  to:
   #  - networks:
   #    - luna-lovegood-0.IP
   #    - cedric-diggory-0.IP
   - name: "allow-egress-to-slytherin"
-    action: "Allow"
+    action: "Accept"
     to:
     - pods:
         namespaceSelector: