merge main

Author: sgalsaleh

.github/actions/e2e/action.yml

@@ -19,12 +19,6 @@ inputs:
   license:
     description: 'license (b64) to use for e2e tests'
     required: true
-  testim-access-token:
-    description: 'testim access token'
-    required: true
-  testim-branch:
-    description: 'testim branch'
-    required: true
   dr-aws-access-key-id:
     description: 'Disaster Recovery AWS Access Key ID'
     required: true
@@ -90,8 +84,6 @@ runs:
       export SNAPSHOT_LICENSE_ID=${{ inputs.snapshot-license-id }}
       echo "${{ inputs.license }}" | base64 --decode > e2e/license.yaml
       echo "${{ inputs.snapshot-license }}" | base64 --decode > e2e/snapshot-license.yaml
-      export TESTIM_ACCESS_TOKEN=${{ inputs.testim-access-token }}
-      export TESTIM_BRANCH=${{ inputs.testim-branch }}
       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
@@ -103,20 +95,20 @@ runs:
     uses: actions/upload-artifact@v4
     if: ${{ failure() }}
     with:
-      name: ${{ github.job }}-support-bundle-host.tar.gz
+      name: ${{ inputs.test-name }}-support-bundle-host.tar.gz
       path: ./e2e/support-bundle-host.tar.gz
   - name: Upload Cluster Support Bundle
     uses: actions/upload-artifact@v4
     if: ${{ failure() }}
     with:
-      name: ${{ github.job }}-support-bundle-cluster.tar.gz
+      name: ${{ inputs.test-name }}-support-bundle-cluster.tar.gz
       path: ./e2e/support-bundle-cluster.tar.gz
   - name: Upload Playwright Report
     id: upload-playwright-report
     uses: actions/upload-artifact@v4
     if: ${{ failure() }}
     with:
-      name: ${{ github.job }}-playwright-report.tar.gz
+      name: ${{ inputs.test-name }}-playwright-report.tar.gz
       path: ./e2e/playwright-report.tar.gz
   - name: Print instructions to view Playwright report
     if: ${{ failure() && steps.upload-playwright-report.outputs.artifact-url != '' }}

.github/workflows/pull-request.yaml

@@ -187,6 +187,7 @@ jobs:
           - TestInstallSnapshotFromReplicatedApp
           - TestMultiNodeAirgapUpgradeUbuntuJammy
           - TestSingleNodeDisasterRecovery
+          - TestSingleNodeResumeDisasterRecovery
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -204,8 +205,6 @@ jobs:
         snapshot-license: ${{ secrets.STAGING_EMBEDDED_CLUSTER_SNAPSHOT_LICENSE }}
         license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_LICENSE_ID }}
         license: ${{ secrets.STAGING_EMBEDDED_CLUSTER_LICENSE }}
-        testim-access-token: ${{ secrets.TESTIM_ACCESS_TOKEN }}
-        testim-branch: ${{ github.head_ref == 'main' && 'master' || github.head_ref }}
         dr-aws-access-key-id: ${{ secrets.TESTIM_AWS_ACCESS_KEY_ID }}
         dr-aws-secret-access-key: ${{ secrets.TESTIM_AWS_SECRET_ACCESS_KEY }}
 

.github/workflows/release-dev.yaml

@@ -140,6 +140,7 @@ jobs:
           - TestInstallSnapshotFromReplicatedApp
           - TestMultiNodeAirgapUpgradeUbuntuJammy
           - TestSingleNodeDisasterRecovery
+          - TestSingleNodeResumeDisasterRecovery
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -156,7 +157,5 @@ jobs:
           snapshot-license: ${{ secrets.STAGING_EMBEDDED_CLUSTER_SNAPSHOT_LICENSE }}
           license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_LICENSE_ID }}
           license: ${{ secrets.STAGING_EMBEDDED_CLUSTER_LICENSE }}
-          testim-access-token: ${{ secrets.TESTIM_ACCESS_TOKEN }}
-          testim-branch: 'master'
           dr-aws-access-key-id: ${{ secrets.TESTIM_AWS_ACCESS_KEY_ID }}
           dr-aws-secret-access-key: ${{ secrets.TESTIM_AWS_SECRET_ACCESS_KEY }}

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.0
+ADMIN_CONSOLE_CHART_VERSION = 1.109.3
 ADMIN_CONSOLE_IMAGE_OVERRIDE =
 ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
 EMBEDDED_OPERATOR_CHART_URL = oci://registry.replicated.com/library

cmd/embedded-cluster/install.go

@@ -307,6 +307,7 @@ func ensureK0sConfig(c *cli.Context) error {
 
 // applyUnsupportedOverrides applies overrides to the k0s configuration. Applies first the
 // overrides embedded into the binary and after the ones provided by the user (--overrides).
+// we first apply the k0s config override and then apply the built in overrides.
 func applyUnsupportedOverrides(c *cli.Context, cfg *k0sconfig.ClusterConfig) (*k0sconfig.ClusterConfig, error) {
 	var err error
 	if embcfg, err := release.GetEmbeddedClusterConfig(); err != nil {
@@ -316,6 +317,9 @@ func applyUnsupportedOverrides(c *cli.Context, cfg *k0sconfig.ClusterConfig) (*k
 		if cfg, err = config.PatchK0sConfig(cfg, overrides); err != nil {
 			return nil, fmt.Errorf("unable to patch k0s config: %w", err)
 		}
+		if cfg, err = config.ApplyBuiltInExtensionsOverrides(cfg, embcfg); err != nil {
+			return nil, fmt.Errorf("unable to release built in overrides: %w", err)
+		}
 	}
 	if c.String("overrides") == "" {
 		return cfg, nil
@@ -328,6 +332,9 @@ func applyUnsupportedOverrides(c *cli.Context, cfg *k0sconfig.ClusterConfig) (*k
 	if cfg, err = config.PatchK0sConfig(cfg, overrides); err != nil {
 		return nil, fmt.Errorf("unable to apply overrides: %w", err)
 	}
+	if cfg, err = config.ApplyBuiltInExtensionsOverrides(cfg, eucfg); err != nil {
+		return nil, fmt.Errorf("unable to end user built in overrides: %w", err)
+	}
 	return cfg, nil
 }