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

Author: laverya

.github/actions/e2e/action.yml

@@ -10,6 +10,9 @@ inputs:
   snapshot-license-id:
     description: 'snapshot-enabled license id to use for e2e tests'
     required: true
+  snapshot-license:
+    description: 'snapshot-enabled license (b64) to use for e2e tests'
+    required: true
   license-id:
     description: 'license id to use for e2e tests'
     required: true
@@ -22,6 +25,12 @@ inputs:
   testim-branch:
     description: 'testim branch'
     required: true
+  dr-aws-access-key-id:
+    description: 'Disaster Recovery AWS Access Key ID'
+    required: true
+  dr-aws-secret-access-key:
+    description: 'Disaster Recovery AWS Secret Access Key'
+    required: true
 
 runs:
   using: composite
@@ -80,8 +89,15 @@ runs:
       export AIRGAP_LICENSE_ID=${{ inputs.airgap-license-id }}
       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
+      export DR_AWS_S3_PREFIX=${{ inputs.test-name }}-${{ github.run_id }}
+      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 }}
   - name: Upload Host Support Bundle
     uses: actions/upload-artifact@v4
@@ -95,6 +111,29 @@ runs:
     with:
       name: ${{ github.job }}-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
+      path: ./e2e/playwright-report.tar.gz
+  - name: Print instructions to view Playwright report
+    if: ${{ failure() && steps.upload-playwright-report.outputs.artifact-url != '' }}
+    run: |
+      echo -e "\e[1;33m┌──────────────────────────────────────────────────────────────────────────────────────────────────────┐\e[0m"
+      echo -e "\e[1;33m                                  To view the Playwright test report:                                   \e[0m"
+      echo -e "\e[1;33m                                                                                                        \e[0m"
+      echo -e "\e[1;33m   1- Download & extract the report from:                                                               \e[0m"
+      echo -e "\e[1;33m                                                                                                        \e[0m"
+      echo -e "\e[1;34m      ${{ steps.upload-playwright-report.outputs.artifact-url }}                                        \e[0m"
+      echo -e "\e[1;33m                                                                                                        \e[0m"
+      echo -e "\e[1;33m   2- From inside the extracted directory, run:                                                         \e[0m"
+      echo -e "\e[1;33m                                                                                                        \e[0m"
+      echo -e "\e[1;32m      npx playwright show-report .                                                                      \e[0m"
+      echo -e "\e[1;33m                                                                                                        \e[0m"
+      echo -e "\e[1;33m└──────────────────────────────────────────────────────────────────────────────────────────────────────┘\e[0m"
+    shell: bash
   # - name: Setup upterm session (ssh)
   #   uses: lhotari/action-upterm@v1
   #   if: always()

.github/workflows/pull-request.yaml

@@ -186,6 +186,7 @@ jobs:
           - TestSingleNodeAirgapUpgradeUbuntuJammy
           - TestInstallSnapshotFromReplicatedApp
           - TestMultiNodeAirgapUpgradeUbuntuJammy
+          - TestSingleNodeDisasterRecovery
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -200,11 +201,13 @@ jobs:
         test-name: '${{ matrix.tests }}'
         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 }}
         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 }}
 
   # this job will validate that all the tests passed
   # it is used for the github branch protection rule

.github/workflows/release-dev.yaml

@@ -139,6 +139,7 @@ jobs:
           - TestSingleNodeAirgapUpgradeUbuntuJammy
           - TestInstallSnapshotFromReplicatedApp
           - TestMultiNodeAirgapUpgradeUbuntuJammy
+          - TestSingleNodeDisasterRecovery
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -152,7 +153,10 @@ jobs:
           test-name: '${{ matrix.tests }}'
           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 }}
           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,12 +4,12 @@ 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.108.13
+ADMIN_CONSOLE_CHART_VERSION = 1.109.0
 ADMIN_CONSOLE_IMAGE_OVERRIDE =
 ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
 EMBEDDED_OPERATOR_CHART_URL = oci://registry.replicated.com/library
 EMBEDDED_OPERATOR_CHART_NAME = embedded-cluster-operator
-EMBEDDED_OPERATOR_CHART_VERSION = 0.30.3
+EMBEDDED_OPERATOR_CHART_VERSION = 0.30.5
 EMBEDDED_OPERATOR_UTILS_IMAGE = busybox:1.36.1
 EMBEDDED_CLUSTER_OPERATOR_IMAGE_OVERRIDE =
 OPENEBS_CHART_URL = https://openebs.github.io/openebs

cmd/embedded-cluster/install.go

@@ -22,6 +22,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/prompts"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	"github.com/replicatedhq/embedded-cluster/pkg/spinner"
+	"github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta2"
 )
 
 // ErrNothingElseToAdd is an error returned when there is nothing else to add to the
@@ -92,14 +93,18 @@ func runPostInstall() error {
 	return installAndEnableLocalArtifactMirror()
 }
 
-// runHostPreflights run the host preflights we found embedded in the binary
+// RunHostPreflights runs the host preflights we found embedded in the binary
 // on all configured hosts. We attempt to read HostPreflights from all the
 // embedded Helm Charts and from the Kots Application Release files.
-func runHostPreflights(c *cli.Context) error {
+func RunHostPreflights(c *cli.Context) error {
 	hpf, err := addons.NewApplier().HostPreflights()
 	if err != nil {
 		return fmt.Errorf("unable to read host preflights: %w", err)
 	}
+	return runHostPreflights(c, hpf)
+}
+
+func runHostPreflights(c *cli.Context, hpf *v1beta2.HostPreflightSpec) error {
 	if len(hpf.Collectors) == 0 && len(hpf.Analyzers) == 0 {
 		return nil
 	}
@@ -246,7 +251,7 @@ func materializeFiles(c *cli.Context) error {
 		}
 	}
 
-	mat.Infof("Host files materialized")
+	mat.Infof("Host files materialized!")
 
 	return nil
 }
@@ -365,7 +370,7 @@ func waitForK0s() error {
 	if _, err := helpers.RunCommand(defaults.K0sBinaryPath(), "status"); err != nil {
 		return fmt.Errorf("unable to get status: %w", err)
 	}
-	loading.Infof("Node installation finished")
+	loading.Infof("Node installation finished!")
 	return nil
 }
 
@@ -468,7 +473,7 @@ var installCommand = &cli.Command{
 			return err
 		}
 		logrus.Debugf("running host preflights")
-		if err := runHostPreflights(c); err != nil {
+		if err := RunHostPreflights(c); err != nil {
 			err := fmt.Errorf("unable to finish preflight checks: %w", err)
 			metrics.ReportApplyFinished(c, err)
 			return err

cmd/embedded-cluster/join.go

@@ -152,7 +152,7 @@ var joinCommand = &cli.Command{
 			return err
 		}
 
-		if err := runHostPreflights(c); err != nil {
+		if err := RunHostPreflights(c); err != nil {
 			err := fmt.Errorf("unable to run host preflights locally: %w", err)
 			metrics.ReportJoinFailed(c.Context, jcmd.MetricsBaseURL, jcmd.ClusterID, err)
 			return err

cmd/embedded-cluster/main.go

@@ -35,6 +35,7 @@ func main() {
 			resetCommand,
 			materializeCommand,
 			updateCommand,
+			restoreCommand,
 		},
 	}
 	if err := app.RunContext(ctx, os.Args); err != nil {