[test]: Additional fixes for flaky tests

Signed-off-by: Moshe Vayner <moshe@vayner.me>

Author: moshevayner

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

@@ -68,42 +68,41 @@ spec:
             content: |
               set -euo pipefail
 
-              for i in {1..10}; do
-                  nbid=$(KUBECONFIG=$KUBECONFIG NAMESPACE=$NAMESPACE LINODE_TOKEN=$LINODE_TOKEN ../scripts/get-nb-id.sh)
+              nbid=$(KUBECONFIG=$KUBECONFIG NAMESPACE=$NAMESPACE LINODE_TOKEN=$LINODE_TOKEN ../scripts/get-nb-id.sh)
 
-                  fw=$(curl -s --request GET \
-                    -H "Authorization: Bearer $LINODE_TOKEN" \
-                    -H "Content-Type: application/json" --fail-early --retry 3 \
-                    -H "accept: application/json" \
-                    "$LINODE_URL/v4/nodebalancers/${nbid}/firewalls" || true)
-                  
-                  fwid=$(echo $fw | jq -r '.data[].id')
+              fw=$(curl -s --request GET \
+                -H "Authorization: Bearer $LINODE_TOKEN" \
+                -H "Content-Type: application/json" --fail-early --retry 3 \
+                -H "accept: application/json" \
+                "$LINODE_URL/v4/nodebalancers/${nbid}/firewalls" || true)
 
-                  # Patch service to remove ACL annotation
-                  kubectl patch service svc-test -n $NAMESPACE --type=json -p='[{"op": "remove", "path": "/metadata/annotations/service.beta.kubernetes.io~1linode-loadbalancer-firewall-acl"}]'
-                  sleep 5
+              fwid=$(echo $fw | jq -r '.data[].id')
 
-                  # Check that firewall is no longer attached to nb
-                  fw=$(curl -s --request GET \
-                    -H "Authorization: Bearer $LINODE_TOKEN" \
-                    -H "Content-Type: application/json" --fail-early --retry 3 \
-                    -H "accept: application/json" \
-                    "$LINODE_URL/v4/nodebalancers/${nbid}/firewalls" || true)
-                  
-                  fwCount=$(echo $fw | jq -r '.data | length')
+              # Patch service to remove ACL annotation
+              kubectl patch service svc-test -n $NAMESPACE --type=json -p='[{"op": "remove", "path": "/metadata/annotations/service.beta.kubernetes.io~1linode-loadbalancer-firewall-acl"}]'
 
-                  # Check if firewall is deleted
-                  fwRespCode=$(curl -s -o /dev/null -w "%{http_code}" \
-                    --request GET \
-                    -H "Authorization: Bearer $LINODE_TOKEN" \
-                    -H "accept: application/json" \
-                    "$LINODE_URL/v4/networking/firewalls/${fwid}" || true)
-
-                  if [[ $fwCount -eq 0 && $fwRespCode -eq "404" ]]; then
-                      echo "firewall detatched and deleted"
-                      break
-                  fi
-                  sleep 10
+              for i in {1..10}; do
+                # Check that firewall is no longer attached to nb
+                fw=$(curl -s --request GET \
+                  -H "Authorization: Bearer $LINODE_TOKEN" \
+                  -H "Content-Type: application/json" --fail-early --retry 3 \
+                  -H "accept: application/json" \
+                  "$LINODE_URL/v4/nodebalancers/${nbid}/firewalls" || true)
+
+                fwCount=$(echo $fw | jq -r '.data | length')
+
+                # Check if firewall is deleted
+                fwRespCode=$(curl -s -o /dev/null -w "%{http_code}" \
+                  --request GET \
+                  -H "Authorization: Bearer $LINODE_TOKEN" \
+                  -H "accept: application/json" \
+                  "$LINODE_URL/v4/networking/firewalls/${fwid}" || true)
+
+                if [[ $fwCount -eq 0 && $fwRespCode -eq "404" ]]; then
+                    echo "firewall detatched and deleted"
+                    break
+                fi
+                sleep 10
               done
             check:
                 ($error == null): true

e2e/test/lb-with-http-to-https/chainsaw-test.yaml

@@ -43,7 +43,7 @@ spec:
               kubectl patch svc svc-test -n $NAMESPACE --type='json' -p='[{"op": "add", "path": "/spec/ports/-", "value": {"name": "https", "port": 443, "targetPort": 8080, "protocol": "TCP"}}]'
             check:
               ($error == null): true
-    - name: Check endpoints
+    - name: Check endpoints have addresses
       try:
       - assert:
           resource:
@@ -53,14 +53,22 @@ spec:
               name: svc-test
             (subsets[0].addresses != null): true
             (subsets[0].ports != null): true
-            (length(subsets[0].ports)): 2
       catch:
         - describe:
             apiVersion: v1
             kind: Pod
         - describe:
             apiVersion: v1
             kind: Service
+    - name: Check endpoints have two ports
+      try:
+      - assert:
+          resource:
+            apiVersion: v1
+            kind: Endpoints
+            metadata:
+              name: svc-test
+            (length(subsets[0].ports)): 2
     - name: Check that loadbalancer ip is assigned
       try:
       - assert:

e2e/test/lb-with-proxyprotocol-override/chainsaw-test.yaml

@@ -36,6 +36,16 @@ spec:
               name: svc-test
             (subsets[0].addresses != null): true
             (subsets[0].ports != null): true
+    - name: Check that loadbalancer ip is assigned
+      try:
+      - assert:
+          resource:
+            apiVersion: v1
+            kind: Service
+            metadata:
+              name: svc-test
+            status:
+              (loadBalancer.ingress[0].ip != null): true
     - name: Annotate service port 80 with v1 and 8080 with v2
       try:
         - script:

e2e/test/lb-with-proxyprotocol-port-specific/chainsaw-test.yaml

@@ -36,6 +36,16 @@ spec:
               name: svc-test
             (subsets[0].addresses != null): true
             (subsets[0].ports != null): true
+    - name: Check that loadbalancer ip is assigned
+      try:
+      - assert:
+          resource:
+            apiVersion: v1
+            kind: Service
+            metadata:
+              name: svc-test
+            status:
+              (loadBalancer.ingress[0].ip != null): true
     - name: Annotate service port 80 with v1 and 8080 with v2
       try:
         - script: