Updated tests to match main

Author: Andrews2024

e2e/test/fw-use-specified-nb/chainsaw-test.yaml

@@ -3,25 +3,15 @@ apiVersion: chainsaw.kyverno.io/v1alpha1
 kind: Test
 metadata:
   name: fw-use-specified-nb
-<<<<<<< HEAD
-=======
   labels:
     all:
     lke:
->>>>>>> main
 spec:
   bindings:
     - name: fwname
       value: (join('-', ['ccm-fwtest', env('CLUSTER_NAME')]))
   namespace: "fw-use-specified-nb"
   steps:
-<<<<<<< HEAD
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
-=======
->>>>>>> main
     - name: Create firewall, Create pods and services
       try:
         - script:

e2e/test/lb-created-with-new-nb-id/chainsaw-test.yaml

@@ -3,22 +3,12 @@ apiVersion: chainsaw.kyverno.io/v1alpha1
 kind: Test
 metadata:
   name: lb-created-with-new-nb-id
-<<<<<<< HEAD
-spec:
-  namespace: "lb-created-with-new-nb-id"
-  steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
-=======
   labels:
     all:
     lke:
 spec:
   namespace: "lb-created-with-new-nb-id"
   steps:
->>>>>>> main
     - name: Create nodebalancer and create resources
       try:
         - script:

e2e/test/lb-created-with-specified-nb-id/chainsaw-test.yaml

@@ -3,22 +3,12 @@ apiVersion: chainsaw.kyverno.io/v1alpha1
 kind: Test
 metadata:
   name: lb-created-with-specified-nb-id
-<<<<<<< HEAD
-spec:
-  namespace: "lb-created-with-specified-nb-id"
-  steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
-=======
   labels:
     all:
     lke:
 spec:
   namespace: "lb-created-with-specified-nb-id"
   steps:
->>>>>>> main
     - name: Create nodebalancer and create resources
       try:
         - script:

e2e/test/lb-delete-svc-no-nb/chainsaw-test.yaml

@@ -3,22 +3,12 @@ apiVersion: chainsaw.kyverno.io/v1alpha1
 kind: Test
 metadata:
   name: lb-delete-svc-no-nb
-<<<<<<< HEAD
-spec:
-  namespace: "lb-delete-svc-no-nb"
-  steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
-=======
   labels:
     all:
     lke:
 spec:
   namespace: "lb-delete-svc-no-nb"
   steps:
->>>>>>> main
     - name: Create nodebalancer and create resources
       try:
         - script:

e2e/test/lb-delete-svc-use-new-nbid/chainsaw-test.yaml

@@ -3,22 +3,12 @@ apiVersion: chainsaw.kyverno.io/v1alpha1
 kind: Test
 metadata:
   name: lb-delete-svc-use-new-nbid
-<<<<<<< HEAD
-spec:
-  namespace: "lb-delete-svc-use-new-nbid"
-  steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
-=======
   labels:
     all:
     lke:
 spec:
   namespace: "lb-delete-svc-use-new-nbid"
   steps:
->>>>>>> main
     - name: Create nodebalancer and create resources
       try:
         - script:

e2e/test/lb-delete-svc-use-specified-nb/chainsaw-test.yaml

@@ -3,22 +3,12 @@ apiVersion: chainsaw.kyverno.io/v1alpha1
 kind: Test
 metadata:
   name: lb-delete-svc-use-specified-nb
-<<<<<<< HEAD
-spec:
-  namespace: "lb-delete-svc-use-specified-nb"
-  steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
-=======
   labels:
     all:
     lke:
 spec:
   namespace: "lb-delete-svc-use-specified-nb"
   steps:
->>>>>>> main
     - name: Create nodebalancer and create resources
       try:
         - script:

e2e/test/lb-fw-delete-acl/chainsaw-test.yaml

@@ -3,22 +3,12 @@ apiVersion: chainsaw.kyverno.io/v1alpha1
 kind: Test
 metadata:
   name: lb-fw-delete-acl
-<<<<<<< HEAD
-spec:
-  namespace: "lb-fw-delete-acl"
-  steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
-=======
   labels:
     all:
     lke:
 spec:
   namespace: "lb-fw-delete-acl"
   steps:
->>>>>>> main
     - name: Create pods and services
       try:
         - apply:

e2e/test/lb-fw-update-acl/chainsaw-test.yaml

@@ -3,22 +3,12 @@ apiVersion: chainsaw.kyverno.io/v1alpha1
 kind: Test
 metadata:
   name: lb-fw-update-acl
-<<<<<<< HEAD
-spec:
-  namespace: "lb-fw-update-acl"
-  steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
-=======
   labels:
     all:
     lke:
 spec:
   namespace: "lb-fw-update-acl"
   steps:
->>>>>>> main
     - name: Create pods and services
       try:
         - apply:

e2e/test/lb-hostname-only-ingress/chainsaw-test.yaml

@@ -3,22 +3,12 @@ apiVersion: chainsaw.kyverno.io/v1alpha1
 kind: Test
 metadata:
   name: lb-hostname-only-ingress
-<<<<<<< HEAD
-spec:
-  namespace: "lb-hostname-only-ingress"
-  steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
-=======
   labels:
     all:
     lke:
 spec:
   namespace: "lb-hostname-only-ingress"
   steps:
->>>>>>> main
     - name: Create pods and services
       try:
         - apply:

e2e/test/lb-http-body-health-check/chainsaw-test.yaml

@@ -3,22 +3,12 @@ apiVersion: chainsaw.kyverno.io/v1alpha1
 kind: Test
 metadata:
   name: lb-http-body-health-check
-<<<<<<< HEAD
-spec:
-  namespace: "lb-http-body-health-check"
-  steps:
-    - name: Check if CCM is deployed
-      try:
-        - assert:
-            file: ../assert-ccm-resources.yaml
-=======
   labels:
     all:
     lke:
 spec:
   namespace: "lb-http-body-health-check"
   steps:
->>>>>>> main
     - name: Create pods and services
       try:
         - apply: