Merge remote-tracking branch 'origin/main' into k0s-1-28-9

Author: laverya

.github/actions/e2e/action.yml

@@ -16,6 +16,9 @@ inputs:
   license-id:
     description: 'license id to use for e2e tests'
     required: true
+  airgap-snapshot-license-id:
+    description: 'airgap-snapshot-enabled license id to use for e2e tests'
+    required: true
   license:
     description: 'license (b64) to use for e2e tests'
     required: true
@@ -82,12 +85,14 @@ runs:
       export LICENSE_ID=${{ inputs.license-id }}
       export AIRGAP_LICENSE_ID=${{ inputs.airgap-license-id }}
       export SNAPSHOT_LICENSE_ID=${{ inputs.snapshot-license-id }}
+      export AIRGAP_SNAPSHOT_LICENSE_ID=${{ inputs.airgap-snapshot-license-id }}
       echo "${{ inputs.license }}" | base64 --decode > e2e/license.yaml
       echo "${{ inputs.snapshot-license }}" | base64 --decode > e2e/snapshot-license.yaml
       export DR_AWS_S3_ENDPOINT=https://s3.amazonaws.com
       export DR_AWS_S3_REGION=us-east-1
       export DR_AWS_S3_BUCKET=kots-testim-snapshots
-      export DR_AWS_S3_PREFIX=${{ inputs.test-name }}-${{ github.run_id }}
+      export DR_AWS_S3_PREFIX=${{ inputs.test-name }}-${{ github.run_id }}-${{ github.run_attempt }}
+      export DR_AWS_S3_PREFIX_AIRGAP=${{ inputs.test-name }}-${{ github.run_id }}-${{ github.run_attempt }}-airgap
       export DR_AWS_ACCESS_KEY_ID=${{ inputs.dr-aws-access-key-id }}
       export DR_AWS_SECRET_ACCESS_KEY=${{ inputs.dr-aws-secret-access-key }}
       make e2e-test TEST_NAME=${{ inputs.test-name }}

.github/workflows/pull-request.yaml

@@ -188,6 +188,7 @@ jobs:
           - TestMultiNodeAirgapUpgradeUbuntuJammy
           - TestSingleNodeDisasterRecovery
           - TestSingleNodeResumeDisasterRecovery
+          - TestSingleNodeAirgapDisasterRecovery
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -203,6 +204,7 @@ jobs:
         airgap-license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_AIRGAP_LICENSE_ID }}
         snapshot-license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_SNAPSHOT_LICENSE_ID }}
         snapshot-license: ${{ secrets.STAGING_EMBEDDED_CLUSTER_SNAPSHOT_LICENSE }}
+        airgap-snapshot-license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_AIRGAP_SNAPSHOT_LICENSE_ID }}
         license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_LICENSE_ID }}
         license: ${{ secrets.STAGING_EMBEDDED_CLUSTER_LICENSE }}
         dr-aws-access-key-id: ${{ secrets.TESTIM_AWS_ACCESS_KEY_ID }}

.github/workflows/release-dev.yaml

@@ -141,6 +141,7 @@ jobs:
           - TestMultiNodeAirgapUpgradeUbuntuJammy
           - TestSingleNodeDisasterRecovery
           - TestSingleNodeResumeDisasterRecovery
+          - TestSingleNodeAirgapDisasterRecovery
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -155,6 +156,7 @@ jobs:
           airgap-license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_AIRGAP_LICENSE_ID }}
           snapshot-license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_SNAPSHOT_LICENSE_ID }}
           snapshot-license: ${{ secrets.STAGING_EMBEDDED_CLUSTER_SNAPSHOT_LICENSE }}
+          airgap-snapshot-license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_AIRGAP_SNAPSHOT_LICENSE_ID }}
           license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_LICENSE_ID }}
           license: ${{ secrets.STAGING_EMBEDDED_CLUSTER_LICENSE }}
           dr-aws-access-key-id: ${{ secrets.TESTIM_AWS_ACCESS_KEY_ID }}

Makefile

@@ -4,7 +4,7 @@ ARCH := $(shell uname -m)
 APP_NAME = embedded-cluster
 ADMIN_CONSOLE_CHART_URL = oci://registry.replicated.com/library
 ADMIN_CONSOLE_CHART_NAME = admin-console
-ADMIN_CONSOLE_CHART_VERSION = 1.109.3
+ADMIN_CONSOLE_CHART_VERSION = 1.109.4
 ADMIN_CONSOLE_IMAGE_OVERRIDE =
 ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
 EMBEDDED_OPERATOR_CHART_URL = oci://registry.replicated.com/library