DO NOT MERGE: test embedded cluster upgrades

.github/actions/e2e/action.yml

@@ -89,7 +89,8 @@ runs:
   - name: E2E
     shell: bash
     run: |
-      export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
+      SHA=${{ github.event.pull_request.head.sha || github.sha }}
+      export SHORT_SHA=dev-${SHA::7}
       export LICENSE_ID=${{ inputs.license-id }}
       export AIRGAP_LICENSE_ID=${{ inputs.airgap-license-id }}
       export SNAPSHOT_LICENSE_ID=${{ inputs.snapshot-license-id }}
@@ -109,7 +110,7 @@ runs:
     if: ${{ failure() }}
     with:
       name: ${{ inputs.test-name }}-support-bundle-host.tar.gz
-      path: ./e2e/support-bundle-host.tar.gz
+      path: ./e2e/support-bundle-host-*.tar.gz
   - name: Upload Cluster Support Bundle
     uses: actions/upload-artifact@v4
     if: ${{ failure() }}

.github/workflows/pull-request.yaml

@@ -63,15 +63,17 @@ jobs:
 
     - name: Build and push local-artifact-mirror image
       run: |
-        export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
+        SHA=${{ github.event.pull_request.head.sha }}
+        export SHORT_SHA=dev-${SHA::7}
         export LOCAL_ARTIFACT_MIRROR_IMAGE=registry.staging.replicated.com/library/embedded-cluster-local-artifact-mirror
         make build-and-push-local-artifact-mirror-image VERSION="${SHORT_SHA}"
         make build-and-push-local-artifact-mirror-image VERSION="${SHORT_SHA}-previous-k0s"
         make build-and-push-local-artifact-mirror-image VERSION="${SHORT_SHA}-upgrade"
 
     - name: Build Linux AMD64 and Output Metadata
       run: |
-        export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
+        SHA=${{ github.event.pull_request.head.sha }}
+        export SHORT_SHA=dev-${SHA::7}
         export LOCAL_ARTIFACT_MIRROR_IMAGE=registry.staging.replicated.com/library/embedded-cluster-local-artifact-mirror
         make -B embedded-cluster-linux-amd64 K0S_VERSION=$(make print-PREVIOUS_K0S_VERSION) K0S_BINARY_SOURCE_OVERRIDE=$(make print-PREVIOUS_K0S_BINARY_SOURCE_OVERRIDE) VERSION="${SHORT_SHA}-previous-k0s"
         tar -C output/bin -czvf embedded-cluster-linux-amd64-previous-k0s.tgz embedded-cluster
@@ -98,7 +100,8 @@ jobs:
         REPLICATED_API_TOKEN: ${{ secrets.STAGING_REPLICATED_API_TOKEN }}
         REPLICATED_API_ORIGIN: "https://api.staging.replicated.com/vendor"
       run: |
-        export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
+        SHA=${{ github.event.pull_request.head.sha }}
+        export SHORT_SHA=dev-${SHA::7}
         echo "${SHORT_SHA}"
         sed -i "s/__version_string__/${SHORT_SHA}/g" e2e/kots-release-install/cluster-config.yaml
         sed -i "s/__version_string__/${SHORT_SHA}-upgrade/g" e2e/kots-release-upgrade/cluster-config.yaml
@@ -110,7 +113,8 @@ jobs:
         replicated release create --yaml-dir e2e/kots-release-upgrade --promote CI --version "appver-${SHORT_SHA}-upgrade"
     - name: Build CI binary
       run: |
-        export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
+        SHA=${{ github.event.pull_request.head.sha }}
+        export SHORT_SHA=dev-${SHA::7}
         export LOCAL_ARTIFACT_MIRROR_IMAGE=registry.staging.replicated.com/library/embedded-cluster-local-artifact-mirror
         echo "# channel release object" > e2e/kots-release-install/release.yaml
         echo 'channelID: "2cHXb1RCttzpR0xvnNWyaZCgDBP"' >> e2e/kots-release-install/release.yaml
@@ -129,7 +133,8 @@ jobs:
         AWS_SECRET_ACCESS_KEY: ${{ secrets.STAGING_EMBEDDED_CLUSTER_UPLOAD_IAM_SECRET }}
         AWS_REGION: "us-east-1"
       run: |
-        export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
+        SHA=${{ github.event.pull_request.head.sha }}
+        export SHORT_SHA=dev-${SHA::7}
         export EC_VERSION="v${SHORT_SHA}"
         ./scripts/cache-files.sh
         ./scripts/create-upgrade-release.sh
@@ -141,7 +146,8 @@ jobs:
         REPLICATED_API_TOKEN: ${{ secrets.STAGING_REPLICATED_API_TOKEN }}
         REPLICATED_API_ORIGIN: "https://api.staging.replicated.com/vendor"
       run: |
-        export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
+        SHA=${{ github.event.pull_request.head.sha }}
+        export SHORT_SHA=dev-${SHA::7}
         echo "${SHORT_SHA}"
         rm e2e/kots-release-install/release.yaml
         replicated release create --yaml-dir e2e/kots-release-install --promote CI-airgap --version "appver-${SHORT_SHA}"
@@ -154,7 +160,8 @@ jobs:
 
     - name: Create download link message text
       run: |
-        export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
+        SHA=${{ github.event.pull_request.head.sha }}
+        export SHORT_SHA=dev-${SHA::7}
 
         echo "This PR has been released (on staging) and is available for download with a embedded-cluster-smoke-test-staging-app [license ID](https://vendor.staging.replicated.com/apps/embedded-cluster-smoke-test-staging-app/customers?sort=name-asc)." > download-link.txt
         echo "" >> download-link.txt

.github/workflows/release-dev.yaml

@@ -30,15 +30,15 @@ jobs:
 
       - name: Build and push local-artifact-mirror image
         run: |
-          export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
+          export SHORT_SHA=dev-${GITHUB_SHA::7}
           export LOCAL_ARTIFACT_MIRROR_IMAGE=registry.staging.replicated.com/library/embedded-cluster-local-artifact-mirror
           make build-and-push-local-artifact-mirror-image VERSION="${SHORT_SHA}"
           make build-and-push-local-artifact-mirror-image VERSION="${SHORT_SHA}-previous-k0s"
           make build-and-push-local-artifact-mirror-image VERSION="${SHORT_SHA}-upgrade"
 
       - name: Build Linux AMD64 and Output Metadata
         run: |
-          export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
+          export SHORT_SHA=dev-${GITHUB_SHA::7}
           export LOCAL_ARTIFACT_MIRROR_IMAGE=registry.staging.replicated.com/library/embedded-cluster-local-artifact-mirror
           make -B embedded-cluster-linux-amd64 K0S_VERSION=$(make print-PREVIOUS_K0S_VERSION) K0S_BINARY_SOURCE_OVERRIDE=$(make print-PREVIOUS_K0S_BINARY_SOURCE_OVERRIDE) VERSION="${SHORT_SHA}-previous-k0s"
           tar -C output/bin -czvf embedded-cluster-linux-amd64-previous-k0s.tgz embedded-cluster
@@ -74,7 +74,7 @@ jobs:
           REPLICATED_API_TOKEN: ${{ secrets.STAGING_REPLICATED_API_TOKEN }}
           REPLICATED_API_ORIGIN: "https://api.staging.replicated.com/vendor"
         run: |
-          export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
+          export SHORT_SHA=dev-${GITHUB_SHA::7}
           echo "${SHORT_SHA}"
           sed -i "s/__version_string__/${SHORT_SHA}/g" e2e/kots-release-install/cluster-config.yaml
           sed -i "s/__version_string__/${SHORT_SHA}-upgrade/g" e2e/kots-release-upgrade/cluster-config.yaml
@@ -86,7 +86,7 @@ jobs:
           replicated release create --yaml-dir e2e/kots-release-upgrade --promote CI --version "appver-${SHORT_SHA}-upgrade"
       - name: Build CI binary
         run: |
-          export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
+          export SHORT_SHA=dev-${GITHUB_SHA::7}
           export LOCAL_ARTIFACT_MIRROR_IMAGE=registry.staging.replicated.com/library/embedded-cluster-local-artifact-mirror
           echo "# channel release object" > e2e/kots-release-install/release.yaml
           echo 'channelID: "2cHXb1RCttzpR0xvnNWyaZCgDBP"' >> e2e/kots-release-install/release.yaml
@@ -105,7 +105,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.STAGING_EMBEDDED_CLUSTER_UPLOAD_IAM_SECRET }}
           AWS_REGION: "us-east-1"
         run: |
-          export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
+          export SHORT_SHA=dev-${GITHUB_SHA::7}
           export EC_VERSION="v${SHORT_SHA}"
           ./scripts/cache-files.sh
           ./scripts/create-upgrade-release.sh
@@ -116,7 +116,7 @@ jobs:
           REPLICATED_API_TOKEN: ${{ secrets.STAGING_REPLICATED_API_TOKEN }}
           REPLICATED_API_ORIGIN: "https://api.staging.replicated.com/vendor"
         run: |
-          export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
+          export SHORT_SHA=dev-${GITHUB_SHA::7}
           echo "${SHORT_SHA}"
           rm e2e/kots-release-install/release.yaml
           replicated release create --yaml-dir e2e/kots-release-install --promote CI-airgap --version "appver-${SHORT_SHA}"

Makefile

@@ -2,13 +2,13 @@ VERSION ?= $(shell git describe --tags --dirty)
 UNAME := $(shell uname)
 ARCH := $(shell uname -m)
 APP_NAME = embedded-cluster
-ADMIN_CONSOLE_CHART_REPO_OVERRIDE =
-ADMIN_CONSOLE_CHART_VERSION = 1.111.0
+ADMIN_CONSOLE_CHART_REPO_OVERRIDE = ttl.sh/sgalsaleh/admin-console
+ADMIN_CONSOLE_CHART_VERSION = 1.1.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.36.5
+ADMIN_CONSOLE_KURL_PROXY_IMAGE_OVERRIDE =
+EMBEDDED_OPERATOR_CHART_VERSION = 0.39.0-build.3
+EMBEDDED_OPERATOR_BINARY_URL_OVERRIDE =
 EMBEDDED_OPERATOR_UTILS_IMAGE = busybox:1.36.1
 EMBEDDED_CLUSTER_OPERATOR_IMAGE_OVERRIDE =
 OPENEBS_CHART_VERSION = 4.1.0
@@ -26,7 +26,7 @@ PREVIOUS_K0S_VERSION ?= v1.28.8+k0s.0
 K0S_BINARY_SOURCE_OVERRIDE = https://ec-k0s-binaries.s3.amazonaws.com/k0s-v1.29.5%2Bk0s.0-ec.0
 PREVIOUS_K0S_BINARY_SOURCE_OVERRIDE =
 TROUBLESHOOT_VERSION = v0.93.1
-KOTS_VERSION = v$(shell echo $(ADMIN_CONSOLE_CHART_VERSION) | sed 's/\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/')
+KOTS_VERSION = v1.111.0
 KOTS_BINARY_URL_OVERRIDE =
 LOCAL_ARTIFACT_MIRROR_IMAGE ?= registry.replicated.com/library/embedded-cluster-local-artifact-mirror
 LOCAL_ARTIFACT_MIRROR_IMAGE_LOCATION = ${LOCAL_ARTIFACT_MIRROR_IMAGE}:$(subst +,-,$(VERSION))
@@ -39,6 +39,7 @@ LD_FLAGS = -X github.com/replicatedhq/embedded-cluster/pkg/defaults.K0sVersion=$
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.Version=$(ADMIN_CONSOLE_CHART_VERSION) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.ImageOverride=$(ADMIN_CONSOLE_IMAGE_OVERRIDE) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.MigrationsImageOverride=$(ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE) \
+	-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.KurlProxyImageOverride=$(ADMIN_CONSOLE_KURL_PROXY_IMAGE_OVERRIDE) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.KotsVersion=$(KOTS_VERSION) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/embeddedclusteroperator.Version=$(EMBEDDED_OPERATOR_CHART_VERSION) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/embeddedclusteroperator.UtilsImage=$(EMBEDDED_OPERATOR_UTILS_IMAGE) \
@@ -181,7 +182,7 @@ print-%:
 
 .PHONY: build-local-artifact-mirror-image
 build-local-artifact-mirror-image:
-	docker build -t $(LOCAL_ARTIFACT_MIRROR_IMAGE_LOCATION) -f Dockerfile .
+	docker build --platform linux/amd64 -t $(LOCAL_ARTIFACT_MIRROR_IMAGE_LOCATION) -f deploy/local-artifact-mirror/Dockerfile .
 
 .PHONY: push-local-artifact-mirror-image
 push-local-artifact-mirror-image:
@@ -193,3 +194,8 @@ build-and-push-local-artifact-mirror-image: build-local-artifact-mirror-image pu
 .PHONY: buildtools
 buildtools:
 	go build -o ./output/bin/buildtools ./cmd/buildtools
+
+.PHONY: cache-files
+cache-files: export EMBEDDED_OPERATOR_BINARY_URL_OVERRIDE
+cache-files:
+	./scripts/cache-files.sh

cmd/embedded-cluster/update.go

@@ -46,7 +46,7 @@ var updateCommand = &cli.Command{
 			return fmt.Errorf("no channel release found")
 		}
 
-		if err := kotscli.UpstreamUpgrade(kotscli.UpstreamUpgradeOptions{
+		if err := kotscli.AirgapUpdate(kotscli.AirgapUpdateOptions{
 			AppSlug:      rel.AppSlug,
 			Namespace:    defaults.KotsadmNamespace,
 			AirgapBundle: c.String("airgap-bundle"),

cmd/local-artifact-mirror/pull.go

@@ -3,13 +3,16 @@ package main
 import (
 	"bytes"
 	"context"
+	"encoding/base64"
 	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
 
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -197,14 +200,15 @@ var binariesCommand = &cli.Command{
 	},
 }
 
-// fetchAndValidateInstallation fetches an Installation object from its name and
-// checks if it is valid for an airgap cluster deployment.
+// fetchAndValidateInstallation fetches an Installation object from its name or directly decodes it
+// and checks if it is valid for an airgap cluster deployment.
 func fetchAndValidateInstallation(ctx context.Context, iname string) (*v1beta1.Installation, error) {
-	logrus.Infof("reading installation %q", iname)
-	nsn := types.NamespacedName{Name: iname}
-	var in v1beta1.Installation
-	if err := kubecli.Get(ctx, nsn, &in); err != nil {
-		return nil, fmt.Errorf("unable to get installation: %w", err)
+	in, err := decodeInstallation(ctx, iname)
+	if err != nil {
+		in, err = fetchInstallationFromCluster(ctx, iname)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	if !in.Spec.AirGap {
@@ -213,5 +217,47 @@ func fetchAndValidateInstallation(ctx context.Context, iname string) (*v1beta1.I
 		return nil, fmt.Errorf("installation has no artifacts")
 	}
 
+	return in, nil
+}
+
+// fetchInstallationFromCluster fetches an Installation object from the cluster.
+func fetchInstallationFromCluster(ctx context.Context, iname string) (*v1beta1.Installation, error) {
+	logrus.Infof("reading installation from cluster %q", iname)
+
+	nsn := types.NamespacedName{Name: iname}
+	var in v1beta1.Installation
+	if err := kubecli.Get(ctx, nsn, &in); err != nil {
+		return nil, fmt.Errorf("unable to get installation: %w", err)
+	}
+
 	return &in, nil
 }
+
+// decodeInstallation decodes an Installation object from a string.
+func decodeInstallation(ctx context.Context, data string) (*v1beta1.Installation, error) {
+	logrus.Info("decoding installation")
+
+	decoded, err := base64.StdEncoding.DecodeString(data)
+	if err != nil {
+		return nil, fmt.Errorf("base64 decode: %w", err)
+	}
+
+	scheme := runtime.NewScheme()
+	err = v1beta1.AddToScheme(scheme)
+	if err != nil {
+		return nil, fmt.Errorf("add to scheme: %w", err)
+	}
+
+	decode := serializer.NewCodecFactory(scheme).UniversalDeserializer().Decode
+	obj, _, err := decode(decoded, nil, nil)
+	if err != nil {
+		return nil, fmt.Errorf("decode: %w", err)
+	}
+
+	in, ok := obj.(*v1beta1.Installation)
+	if !ok {
+		return nil, fmt.Errorf("unexpected object type: %T", obj)
+	}
+
+	return in, nil
+}