Update tests to use policy apiVersion v1

Author: Dean-Coakley

tests/data/access-control/policies/access-control-policy-allow.yaml

@@ -1,4 +1,4 @@
-apiVersion: k8s.nginx.org/v1alpha1
+apiVersion: k8s.nginx.org/v1
 kind: Policy 
 metadata:
   name: allow-policy 

tests/data/access-control/policies/access-control-policy-deny.yaml

@@ -1,4 +1,4 @@
-apiVersion: k8s.nginx.org/v1alpha1
+apiVersion: k8s.nginx.org/v1
 kind: Policy 
 metadata:
   name: deny-policy

tests/data/access-control/policies/access-control-policy-invalid.yaml

@@ -1,4 +1,4 @@
-apiVersion: k8s.nginx.org/v1alpha1
+apiVersion: k8s.nginx.org/v1
 kind: Policy 
 metadata:
   name: invalid-policy 

tests/data/jwt-policy/policies/jwt-policy-invalid-secret.yaml

@@ -1,4 +1,4 @@
-apiVersion: k8s.nginx.org/v1alpha1
+apiVersion: k8s.nginx.org/v1
 kind: Policy
 metadata:
   name: jwt-policy-invalid-secret

tests/data/jwt-policy/policies/jwt-policy-invalid.yaml

@@ -1,4 +1,4 @@
-apiVersion: k8s.nginx.org/v1alpha1
+apiVersion: k8s.nginx.org/v1
 kind: Policy
 metadata:
   name: jwt-policy-invalid

tests/data/jwt-policy/policies/jwt-policy-valid-multi.yaml

@@ -1,4 +1,4 @@
-apiVersion: k8s.nginx.org/v1alpha1
+apiVersion: k8s.nginx.org/v1
 kind: Policy
 metadata:
   name: jwt-policy-valid-multi

tests/data/jwt-policy/policies/jwt-policy-valid.yaml

@@ -1,4 +1,4 @@
-apiVersion: k8s.nginx.org/v1alpha1
+apiVersion: k8s.nginx.org/v1
 kind: Policy
 metadata:
   name: jwt-policy-valid

tests/data/rate-limit/policies/rate-limit-invalid.yaml

@@ -1,4 +1,4 @@
-apiVersion: k8s.nginx.org/v1alpha1
+apiVersion: k8s.nginx.org/v1
 kind: Policy
 metadata:
   name: rate-limit-invalid

tests/data/rate-limit/policies/rate-limit-primary.yaml

@@ -1,4 +1,4 @@
-apiVersion: k8s.nginx.org/v1alpha1
+apiVersion: k8s.nginx.org/v1
 kind: Policy
 metadata:
   name: rate-limit-primary

tests/data/rate-limit/policies/rate-limit-secondary.yaml

@@ -1,4 +1,4 @@
-apiVersion: k8s.nginx.org/v1alpha1
+apiVersion: k8s.nginx.org/v1
 kind: Policy
 metadata:
   name: rate-limit-secondary

tests/suite/custom_resources_utils.py

@@ -83,7 +83,7 @@ def read_crd(custom_objects: CustomObjectsApi, namespace, plural, name) -> objec
         return response
 
     except ApiException:
-        logging.exception(f"Exception occured while getting reading CRD")
+        logging.exception(f"Exception occurred while reading CRD")
         raise
 
 
@@ -104,7 +104,7 @@ def read_ap_crd(custom_objects: CustomObjectsApi, namespace, plural, name) -> ob
         return response
 
     except ApiException:
-        logging.exception(f"Exception occured while getting reading CRD")
+        logging.exception(f"Exception occurred while reading CRD")
         raise
 
 
@@ -122,12 +122,12 @@ def create_policy_from_yaml(custom_objects: CustomObjectsApi, yaml_manifest, nam
         dep = yaml.safe_load(f)
     try:
         custom_objects.create_namespaced_custom_object(
-            "k8s.nginx.org", "v1alpha1", namespace, "policies", dep
+            "k8s.nginx.org", "v1", namespace, "policies", dep
         )
         print(f"Policy created with name '{dep['metadata']['name']}'")
         return dep["metadata"]["name"]
     except ApiException:
-        logging.exception(f"Exception occured while creating Policy: {dep['metadata']['name']}")
+        logging.exception(f"Exception occurred while creating Policy: {dep['metadata']['name']}")
         raise
 
 
@@ -144,12 +144,12 @@ def delete_policy(custom_objects: CustomObjectsApi, name, namespace) -> None:
     delete_options = client.V1DeleteOptions()
 
     custom_objects.delete_namespaced_custom_object(
-        "k8s.nginx.org", "v1alpha1", namespace, "policies", name, delete_options
+        "k8s.nginx.org", "v1", namespace, "policies", name, delete_options
     )
     ensure_item_removal(
         custom_objects.get_namespaced_custom_object,
         "k8s.nginx.org",
-        "v1alpha1",
+        "v1",
         namespace,
         "policies",
         name,
@@ -169,13 +169,13 @@ def read_policy(custom_objects: CustomObjectsApi, namespace, name) -> object:
     print(f"Getting info for policy {name} in namespace {namespace}")
     try:
         response = custom_objects.get_namespaced_custom_object(
-            "k8s.nginx.org", "v1alpha1", namespace, "policies", name
+            "k8s.nginx.org", "v1", namespace, "policies", name
         )
         pprint(response)
         return response
 
     except ApiException:
-        logging.exception(f"Exception occured while getting reading Policy")
+        logging.exception(f"Exception occurred while reading Policy")
         raise
 
 
@@ -201,7 +201,7 @@ def create_virtual_server_from_yaml(
         return dep["metadata"]["name"]
     except ApiException as ex:
         logging.exception(
-            f"Exception: {ex} occured while creating VirtualServer: {dep['metadata']['name']}"
+            f"Exception: {ex} occurred while creating VirtualServer: {dep['metadata']['name']}"
         )
         raise
 

tests/suite/test_jwt_policies.py

@@ -52,7 +52,7 @@
         (
             {
                 "type": "complete",
-                "extra_args": [f"-enable-custom-resources", f"-enable-leader-election=false"],
+                "extra_args": [f"-enable-custom-resources", f"-enable-preview-policies", f"-enable-leader-election=false"],
             },
             {"example": "virtual-server", "app_type": "simple",},
         )

tests/suite/test_jwt_policies_vsr.py

@@ -59,7 +59,7 @@
         (
             {
                 "type": "complete",
-                "extra_args": [f"-enable-custom-resources", f"-enable-leader-election=false"],
+                "extra_args": [f"-enable-custom-resources", f"-enable-preview-policies", f"-enable-leader-election=false"],
             },
             {"example": "virtual-server-route"},
         )

tests/suite/test_rl_policies.py

@@ -33,14 +33,14 @@
         (
             {
                 "type": "complete",
-                "extra_args": [f"-enable-custom-resources", f"-enable-leader-election=false"],
+                "extra_args": [f"-enable-custom-resources", f"-enable-preview-policies", f"-enable-leader-election=false"],
             },
             {"example": "rate-limit", "app_type": "simple",},
         )
     ],
     indirect=True,
 )
-class TestRateLimitingPolcies:
+class TestRateLimitingPolicies:
     def restore_default_vs(self, kube_apis, virtual_server_setup) -> None:
         """
         Restore VirtualServer without policy spec

tests/suite/test_rl_policies_vsr.py

@@ -40,14 +40,14 @@
         (
             {
                 "type": "complete",
-                "extra_args": [f"-enable-custom-resources", f"-enable-leader-election=false"],
+                "extra_args": [f"-enable-custom-resources", f"-enable-preview-policies", f"-enable-leader-election=false"],
             },
             {"example": "virtual-server-route"},
         )
     ],
     indirect=True,
 )
-class TestRateLimitingPolciesVsr:
+class TestRateLimitingPoliciesVsr:
     def restore_default_vsr(self, kube_apis, v_s_route_setup) -> None:
         """
         Function to revert vsr deployments to valid state