bump chart version of ingress-nginx to 4.11.3/4.12.0-beta.0 (#1535)

e2e/kots-release-install/cluster-config.yaml

@@ -48,7 +48,7 @@ spec:
         - name: ingress-nginx
           chartname: ingress-nginx/ingress-nginx
           namespace: ingress-nginx
-          version: "4.8.3"
+          version: "4.11.3"
           values: |
             controller:
               service:

e2e/kots-release-upgrade/cluster-config.yaml

@@ -51,7 +51,7 @@ spec:
         - name: ingress-nginx
           chartname: ingress-nginx/ingress-nginx
           namespace: ingress-nginx
-          version: "4.9.1"
+          version: "4.12.0-beta.0"
           values: |
             controller:
               service:

e2e/scripts/airgap-prepare.sh

@@ -1,7 +1,19 @@
 #!/usr/bin/env bash
 set -euox pipefail
 
+# validate that there is not internet access - the goal of these tests is to ensure that the installation works without
+# internet access, so if we can connect to google obviously the test isn't valid
+function check_internet_access() {
+    if ping -c 1 google.com &>/dev/null; then
+        echo "Internet access is available"
+        exit 1
+    fi
+    echo "Internet access is not available"
+}
+
 main() {
+    check_internet_access
+
     tar xzf /assets/ec-release.tgz
 
     mv embedded-cluster-smoke-test-staging-app /usr/local/bin/embedded-cluster

e2e/scripts/check-postupgrade-state.sh

@@ -5,7 +5,7 @@ DIR=/usr/local/bin
 . $DIR/common.sh
 
 function check_nginx_version {
-    if ! kubectl describe pod -n ingress-nginx | grep -q "4.9.1"; then
+    if ! kubectl describe pod -n ingress-nginx | grep -q "4.12.0-beta.0"; then
         return 1
     fi
     return 0
@@ -55,13 +55,13 @@ main() {
         exit 1
     fi
     # ensure new version is present
-    if ! kubectl describe chart -n kube-system k0s-addon-chart-ingress-nginx | grep -q "4.9.1"; then
-        echo "4.9.1 not found in ingress-nginx chart"
+    if ! kubectl describe chart -n kube-system k0s-addon-chart-ingress-nginx | grep -q "4.12.0-beta.0"; then
+        echo "4.12.0-beta.0 not found in ingress-nginx chart"
         exit 1
     fi
     # ensure the new version made it into the pod
     if ! retry 5 check_nginx_version ; then
-        echo "4.9.1 not found in ingress-nginx pod"
+        echo "4.12.0-beta.0 not found in ingress-nginx pod"
         kubectl describe pod -n ingress-nginx
         exit 1
     fi