Invalid IP event generation message updated. Removed unnecessary echo statements

Author: jpalagir

e2e/test/lb-created-with-invalid-ip/chainsaw-test.yaml

@@ -67,7 +67,7 @@ spec:
         - script: 
             content: |
               set -e
-              
+              sleep 30
               invalid_ip=$(kubectl get configmap invalid-ip-config -o=jsonpath='{.data.InvalidIP}' -n $NAMESPACE)
               if [[ -z "$invalid_ip" ]]; then
                   echo "Error: No invalid ip found in configmap"
@@ -77,23 +77,24 @@ spec:
               events=$(kubectl get events -n $NAMESPACE --field-selector reason=SyncLoadBalancerFailed --sort-by='.lastTimestamp' -o json)
               message=$(echo $events | jq .items[0].message)
 
-              if [[ "$message" =~ ^\"Error\ syncing\ load\ balancer:\ failed\ to\ ensure\ load\ balancer:\ invalid\ IPv4\ address\ in\ annotation\ $annotation:\ invalid\ IP\ address\ format:\ $invalid_ip\"$ ]]; then
+              if [[ "$message" == *"Error syncing load balancer: failed to ensure load balancer: [400] Invalid IPv4 address"* ]]; then
                 echo "Warning event found"
               else
                 echo "Warning event not found"
               fi
-
+              
               service_ip=$(kubectl get svc svc-test -n $NAMESPACE -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
               if [[ "$service_ip" != "" ]]; then
                   echo "Error: service ip found for service svc-test"
               fi
-              echo "{\"service_ip\": $service_ip}"
-              echo "{\"invalid_ip\": $invalid_ip}"
               if [[ "$service_ip" == "$invalid_ip" ]]; then
                 echo "Expected service ip to be null got the invalid ip: $invalid_ip"
               fi
+              echo "{\"service_ip\": $service_ip}"
+              echo "{\"invalid_ip\": $invalid_ip}"
             check:
               ($error == null): true
               (contains($stdout, 'Warning event not found')): false
               (contains($stdout, 'No invalid ip found in configmap')): false
               (contains($stdout, 'Expected service ip to be null got the invalid ip')): false
+              

e2e/test/lb-created-with-reserved-ip-change-ip-unreserved/chainsaw-test.yaml

@@ -131,8 +131,6 @@ spec:
 
               message=$(echo $events | jq .items[0].message)
 
-              echo $message
-
               if [[ "$message" =~ ^\"IPv4\ annotation\ changed\ to\ $unreserved_ip,\ but\ NodeBalancer\ \([0-9]+\)\ IP\ cannot\ be\ updated\ after\ creation.\ It\ will\ remain\ $reserved_ip\"$ ]]; then
                 echo "Warning event found"
               else

e2e/test/lb-created-with-reserved-ip-change-ip/chainsaw-test.yaml

@@ -159,8 +159,6 @@ spec:
 
               message=$(echo $events | jq .items[0].message)
 
-              echo $message
-
               if [[ "$message" =~ ^\"IPv4\ annotation\ changed\ to\ $reserved_ip2,\ but\ NodeBalancer\ \([0-9]+\)\ IP\ cannot\ be\ updated\ after\ creation.\ It\ will\ remain\ $reserved_ip\"$ ]]; then
                 echo "Warning event found"
               else

e2e/test/lb-created-with-reserved-ip-multiple-change-ip/chainsaw-test.yaml

@@ -2,7 +2,7 @@
 apiVersion: chainsaw.kyverno.io/v1alpha1
 kind: Test
 metadata:
-  name: lb-created-with-reserved-ip-multiple-change-ip
+  name: c
   labels:
     all:
     lke:
@@ -143,8 +143,6 @@ spec:
                   echo "Error: No reserved ip found in configmap"
               fi
               
-              echo $NAMESPACE
-              echo $reserved_ip2
               patch=$(kubectl patch service svc-test -n $NAMESPACE --patch "{
                 \"metadata\": {
                   \"annotations\": {
@@ -153,7 +151,7 @@ spec:
                 }
               }")
 
-              sleep 10
+              sleep 30
 
               patch2=$(kubectl patch service svc-test -n $NAMESPACE --patch "{
                 \"metadata\": {
@@ -163,30 +161,25 @@ spec:
                 }
               }")
 
+              sleep 30
               if [[ "$patch" != "service/svc-test patched" ]]; then
                 echo "Unable to update annotation"
               fi
               if [[ "$patch2" != "service/svc-test patched" ]]; then
                 echo "Unable to update annotation"
               fi
               
-              sleep 10
-
               events=$(kubectl get events -n $NAMESPACE --field-selector reason=NodeBalancerIPChangeIgnored --sort-by='.lastTimestamp' -o json)
 
               message=$(echo $events | jq .items[0].message)
               message2=$(echo $events | jq .items[1].message)
 
-              echo $events
-              echo $message
-              echo $message2
-
               if [[ "$message" =~ ^\"IPv4\ annotation\ changed\ to\ $reserved_ip2,\ but\ NodeBalancer\ \([0-9]+\)\ IP\ cannot\ be\ updated\ after\ creation.\ It\ will\ remain\ $reserved_ip\"$ ]]; then
                 echo "Warning event found"
               else
                 echo "Warning event not found"
               fi
-
+              
               if [[ "$message2" =~ ^\"IPv4\ annotation\ changed\ to\ 100.10.10.10,\ but\ NodeBalancer\ \([0-9]+\)\ IP\ cannot\ be\ updated\ after\ creation.\ It\ will\ remain\ $reserved_ip\"$ ]]; then
                 echo "Warning event found"
               else