Add tests for pod startup times with multiple resources

tests/conftest.py

@@ -11,6 +11,8 @@
     DEFAULT_SERVICE,
     DEFAULT_DEPLOYMENT_TYPE,
     NUM_REPLICAS,
+    BATCH_START,
+    BATCH_RESOURCES,
 )
 from suite.resources_utils import get_first_pod_name
 
@@ -80,6 +82,18 @@ def pytest_addoption(parser) -> None:
         default="no",
         help="Show IC logs in stdout on test failure",
     )
+    parser.addoption(
+        "--batch-start",
+        action="store",
+        default=BATCH_START,
+        help="Run tests for pods restarts with multiple resources deployed (Ingress/VS): True/False",
+    )
+    parser.addoption(
+        "--batch-resources",
+        action="store",
+        default=BATCH_RESOURCES,
+        help="Number of VS/Ingress resources to deploy",
+    )
 
 
 # import fixtures into pytest global namespace
@@ -110,6 +124,11 @@ def pytest_collection_modifyitems(config, items) -> None:
         for item in items:
             if "appprotect" in item.keywords:
                 item.add_marker(appprotect)
+    if  str(config.getoption("--batch-start")) != "True":
+        batch_start = pytest.mark.skip(reason="Skipping pod restart test with multiple resources")
+        for item in items:
+            if "batch_start" in item.keywords:
+                item.add_marker(batch_start)
 
 
 @pytest.hookimpl(tryfirst=True, hookwrapper=True)

tests/data/ap-waf/policies/waf-dataguard.yaml

@@ -3,6 +3,7 @@ kind: Policy
 metadata:
   name: waf-policy
 spec:
+  ingressClassName: nginx
   waf:
     enable: true
     apPolicy: "default/dataguard-alarm"

tests/data/appprotect/appprotect-ingress.yaml

@@ -3,13 +3,13 @@ kind: Ingress
 metadata:
   name: appprotect-ingress
   annotations:
-    kubernetes.io/ingress.class: "nginx"
     appprotect.f5.com/app-protect-policy: "test-namespace/example-policy"
     appprotect.f5.com/app-protect-enable: "True"
     appprotect.f5.com/app-protect-security-log-enable: "True"
     appprotect.f5.com/app-protect-security-log: "test-namespace/logconf"
     appprotect.f5.com/app-protect-security-log-destination: "syslog:server=<IP>:<PORT>"
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - appprotect.example.com

tests/data/smoke/standard/smoke-ingress.yaml

@@ -2,9 +2,9 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
-    kubernetes.io/ingress.class: "nginx"
   name: smoke-ingress
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - smoke.example.com

tests/settings.py

@@ -15,6 +15,9 @@
 ALLOWED_SERVICE_TYPES = ["nodeport", "loadbalancer"]
 DEFAULT_DEPLOYMENT_TYPE = "deployment"
 ALLOWED_DEPLOYMENT_TYPES = ["deployment", "daemon-set"]
+BATCH_START = "False"
+# Number of Ingress/VS resources to deploy based on BATCH_START value, ref. line #264 in rresource_utils.py
+BATCH_RESOURCES = 1
 # Time in seconds to ensure reconfiguration changes in cluster
 RECONFIGURATION_DELAY = 3
 NGINX_API_VERSION = 4