add ccm resource check as separate test (#329)

rahulait · web-flow · commit c3fd1040755b · 2025-02-19T16:17:08.000-05:00
diff --git a/e2e/test/ccm-resources/chainsaw-test.yaml b/e2e/test/ccm-resources/chainsaw-test.yaml
@@ -0,0 +1,11 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/kyverno/chainsaw/main/.schemas/json/test-chainsaw-v1alpha1.json
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: check-ccm-resources
+spec:
+  steps:
+    - name: Check if CCM is deployed
+      try:
+        - assert:
+            file: ../assert-ccm-resources.yaml
diff --git a/e2e/test/fw-use-specified-nb/chainsaw-test.yaml b/e2e/test/fw-use-specified-nb/chainsaw-test.yaml
@@ -9,10 +9,6 @@ spec:
       value: (join('-', ['ccm-fwtest', env('CLUSTER_NAME')]))
   namespace: "fw-use-specified-nb"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create firewall, Create pods and services
       try:
         - script:
diff --git a/e2e/test/lb-created-with-new-nb-id/chainsaw-test.yaml b/e2e/test/lb-created-with-new-nb-id/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-created-with-new-nb-id"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create nodebalancer and create resources
       try:
         - script:
diff --git a/e2e/test/lb-created-with-specified-nb-id/chainsaw-test.yaml b/e2e/test/lb-created-with-specified-nb-id/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-created-with-specified-nb-id"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create nodebalancer and create resources
       try:
         - script:
diff --git a/e2e/test/lb-delete-svc-no-nb/chainsaw-test.yaml b/e2e/test/lb-delete-svc-no-nb/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-delete-svc-no-nb"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create nodebalancer and create resources
       try:
         - script:
diff --git a/e2e/test/lb-delete-svc-use-new-nbid/chainsaw-test.yaml b/e2e/test/lb-delete-svc-use-new-nbid/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-delete-svc-use-new-nbid"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create nodebalancer and create resources
       try:
         - script:
diff --git a/e2e/test/lb-delete-svc-use-specified-nb/chainsaw-test.yaml b/e2e/test/lb-delete-svc-use-specified-nb/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-delete-svc-use-specified-nb"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create nodebalancer and create resources
       try:
         - script:
diff --git a/e2e/test/lb-fw-delete-acl/chainsaw-test.yaml b/e2e/test/lb-fw-delete-acl/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-fw-delete-acl"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create pods and services
       try:
         - apply:
diff --git a/e2e/test/lb-fw-update-acl/chainsaw-test.yaml b/e2e/test/lb-fw-update-acl/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-fw-update-acl"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create pods and services
       try:
         - apply:
diff --git a/e2e/test/lb-hostname-only-ingress/chainsaw-test.yaml b/e2e/test/lb-hostname-only-ingress/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-hostname-only-ingress"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create pods and services
       try:
         - apply:
diff --git a/e2e/test/lb-http-body-health-check/chainsaw-test.yaml b/e2e/test/lb-http-body-health-check/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-http-body-health-check"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create pods and services
       try:
         - apply:
diff --git a/e2e/test/lb-http-status-health-check/chainsaw-test.yaml b/e2e/test/lb-http-status-health-check/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-http-status-health-check"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create pods and services
       try:
         - apply:
diff --git a/e2e/test/lb-passive-health-check/chainsaw-test.yaml b/e2e/test/lb-passive-health-check/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-passive-health-check"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create pods and services
       try:
         - apply:
diff --git a/e2e/test/lb-preserve-annotation-new-nb-specified/chainsaw-test.yaml b/e2e/test/lb-preserve-annotation-new-nb-specified/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-preserve-annotation-new-nb-specified"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create resources
       try:
         - apply:
diff --git a/e2e/test/lb-preserve-annotation-svc-delete/chainsaw-test.yaml b/e2e/test/lb-preserve-annotation-svc-delete/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-preserve-annotation-svc-delete"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create resources
       try:
         - apply:
diff --git a/e2e/test/lb-simple/chainsaw-test.yaml b/e2e/test/lb-simple/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-simple"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create pods and services
       try:
         - apply:
diff --git a/e2e/test/lb-single-tls/chainsaw-test.yaml b/e2e/test/lb-single-tls/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-single-tls"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create secret
       try:
         - script:
diff --git a/e2e/test/lb-tcp-connection-health-check/chainsaw-test.yaml b/e2e/test/lb-tcp-connection-health-check/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-tcp-connection-health-check"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create pods and services
       try:
         - apply:
diff --git a/e2e/test/lb-updated-with-nb-id/chainsaw-test.yaml b/e2e/test/lb-updated-with-nb-id/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-updated-with-nb-id"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create pods and services
       try:
         - apply:
diff --git a/e2e/test/lb-with-http-to-https/chainsaw-test.yaml b/e2e/test/lb-with-http-to-https/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-with-http-to-https"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create pods and services
       try:
         - apply:
diff --git a/e2e/test/lb-with-multiple-http-https-ports/chainsaw-test.yaml b/e2e/test/lb-with-multiple-http-https-ports/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-with-multiple-http-https-ports"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create pods and services
       try:
         - apply:
diff --git a/e2e/test/lb-with-node-addition/chainsaw-test.yaml b/e2e/test/lb-with-node-addition/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-with-node-addition"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create resources
       try:
         - apply:
diff --git a/e2e/test/lb-with-proxyprotocol-default-annotation/chainsaw-test.yaml b/e2e/test/lb-with-proxyprotocol-default-annotation/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-with-proxyprotocol-default-annotation"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create pods and services
       try:
         - apply:
diff --git a/e2e/test/lb-with-proxyprotocol-override/chainsaw-test.yaml b/e2e/test/lb-with-proxyprotocol-override/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-with-proxyprotocol-override"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create pods and services
       try:
         - apply:
diff --git a/e2e/test/lb-with-proxyprotocol-port-specific/chainsaw-test.yaml b/e2e/test/lb-with-proxyprotocol-port-specific/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-with-proxyprotocol-port-specific"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create pods and services
       try:
         - apply:
diff --git a/e2e/test/lb-with-proxyprotocol-set/chainsaw-test.yaml b/e2e/test/lb-with-proxyprotocol-set/chainsaw-test.yaml
@@ -6,10 +6,6 @@ metadata:
 spec:
   namespace: "lb-with-proxyprotocol-set"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Create pods and services
       try:
         - apply:
diff --git a/e2e/test/route-controller-test/chainsaw-test.yaml b/e2e/test/route-controller-test/chainsaw-test.yaml
@@ -9,10 +9,6 @@ spec:
       value: (join('-', ['ccm-fwtest', env('CLUSTER_NAME')]))
   namespace: "route-controller-test"
   steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
     - name: Check if the route controller updated the config for the linode
       try:
         - script:
