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

Author: laverya

.github/actions/e2e/action.yml

@@ -4,6 +4,9 @@ inputs:
   test-name:
     description: 'individual test to run'
     required: true
+  airgap-license-id:
+    description: 'airgap-enabled license id to use for e2e tests'
+    required: true
   license-id:
     description: 'license id to use for e2e tests'
     required: true
@@ -36,10 +39,6 @@ runs:
            external_ids:ovn-remote=unix:/var/run/ovn/ovnsb_db.sock \
            external_ids:ovn-encap-type=geneve                      \
            external_ids:ovn-encap-ip=127.0.0.1
-  - name: Setup Go
-    uses: actions/setup-go@v5
-    with:
-      go-version: "1.21.0"
   - name: Free up runner disk space
     shell: bash
     run: |
@@ -49,7 +48,8 @@ runs:
   - name: E2E
     shell: bash
     run: |
-      export SHORT_SHA=$(git rev-parse --short=7 HEAD)
+      export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
       export LICENSE_ID=${{ inputs.license-id }}
+      export AIRGAP_LICENSE_ID=${{ inputs.airgap-license-id }}
       echo "${{ inputs.license }}" | base64 --decode > e2e/license.yaml
       make e2e-test TEST_NAME=${{ inputs.test-name }}

.github/workflows/dependencies.yaml

@@ -23,10 +23,18 @@ jobs:
       run: |
         export VERSION=`curl https://api.github.com/repos/replicatedhq/embedded-cluster-operator/tags | jq -r .[].name | head -1 | tr -d v`
         sed -i "/^EMBEDDED_OPERATOR_CHART_VERSION/c\EMBEDDED_OPERATOR_CHART_VERSION = $VERSION" Makefile
+    - name: Embedded Cluster Operator Utils
+      run: |
+        export VERSION=`curl https://raw.githubusercontent.com/docker-library/busybox/master/versions.json | jq -r .latest.version`
+        sed -i "/^EMBEDDED_OPERATOR_UTILS_IMAGE/c\EMBEDDED_OPERATOR_UTILS_IMAGE = busybox:$VERSION" Makefile
     - name: OpenEBS
       run: |
         export VERSION=`curl https://api.github.com/repos/openebs/charts/releases/latest | jq -r .name | tr -d openebs-`
         sed -i "/^OPENEBS_CHART_VERSION/c\OPENEBS_CHART_VERSION = $VERSION" Makefile
+    - name: OpenEBS utils
+      run: |
+        export VERSION=`curl https://api.github.com/repos/openebs/linux-utils/releases/latest | jq -r .name | tr -d v`
+        sed -i "/^OPENEBS_UTILS_VERSION/c\OPENEBS_UTILS_VERSION = $VERSION" Makefile
     - name: SeaweedFS
       run: |
         export VERSION=`curl https://raw.githubusercontent.com/seaweedfs/seaweedfs/master/k8s/charts/seaweedfs/Chart.yaml | grep version | tr -d 'version: '`

.github/workflows/pull-request.yaml

@@ -44,15 +44,15 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
-    - name: Get short commit hash
-      run: echo "SHORT_SHA=$(git rev-parse --short=7 HEAD)" >> $GITHUB_ENV
     - name: Setup Go
       uses: actions/setup-go@v5
       with:
         go-version: "1.21.0"
     - name: Build Linux AMD64
       run: |
-        make embedded-cluster-linux-amd64 VERSION=dev-$SHORT_SHA
+        export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
+        make embedded-cluster-linux-amd64 VERSION="${SHORT_SHA}"
+        tar -C output/bin -czvf embedded-cluster-linux-amd64.tgz embedded-cluster
     - name: Output Metadata
       run: |
         ./output/bin/embedded-cluster version metadata > metadata.json
@@ -71,7 +71,7 @@ jobs:
         REPLICATED_API_TOKEN: ${{ secrets.STAGING_REPLICATED_API_TOKEN }}
         REPLICATED_API_ORIGIN: "https://api.staging.replicated.com/vendor"
       run: |
-        export SHORT_SHA=$(git rev-parse --short=7 HEAD)
+        export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
         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
@@ -83,26 +83,40 @@ jobs:
         replicated release create --yaml-dir e2e/kots-release-upgrade --promote CI --version "${SHORT_SHA}-upgrade"
     - name: Build CI binary
       run: |
-        export SHORT_SHA=$(git rev-parse --short=7 HEAD)
+        export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
         echo "# channel release object" > e2e/kots-release-install/release.yaml
         echo 'channelID: "2cHXb1RCttzpR0xvnNWyaZCgDBP"' >> e2e/kots-release-install/release.yaml
         echo 'appSlug: "embedded-cluster-smoke-test-staging-app"' >> e2e/kots-release-install/release.yaml
         echo "versionLabel: \"${SHORT_SHA}\"" >> e2e/kots-release-install/release.yaml
         cat e2e/kots-release-install/release.yaml
         cp output/bin/embedded-cluster output/bin/embedded-cluster-original
-        make embedded-release # this is done after the metadata.json is generated so as to not include additional charts
+        make embedded-release VERSION="${SHORT_SHA}" # this is done after the metadata.json is generated so as to not include additional charts
     - name: Cache files for integration test
       env:
         S3_BUCKET: "tf-staging-embedded-cluster-bin"
         AWS_ACCESS_KEY_ID: ${{ secrets.STAGING_EMBEDDED_CLUSTER_UPLOAD_IAM_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.STAGING_EMBEDDED_CLUSTER_UPLOAD_IAM_SECRET }}
         AWS_REGION: "us-east-1"
       run: |
-        export SHORT_SHA=$(git rev-parse --short=7 HEAD)
+        export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
         export EC_VERSION="v${SHORT_SHA}"
         ./scripts/cache-files.sh
         ./scripts/create-upgrade-release.sh
 
+    - name: Create Airgap Release
+      env:
+        REPLICATED_APP: "embedded-cluster-smoke-test-staging-app"
+        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)
+        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
+        
+        rm e2e/kots-release-install/release.yaml
+        replicated release create --yaml-dir e2e/kots-release-install --promote CI-airgap --version "${SHORT_SHA}"
+
     - name: upload binary
       uses: actions/upload-artifact@v4
       with:
@@ -131,11 +145,13 @@ jobs:
           - TestMultiNodeReset
           - TestCommandsRequireSudo
           - TestInstallWithoutEmbed
+          - TestInstallFromReplicatedApp
           - TestResetAndReinstall
           - TestCollectSupportBundle
           - TestOldVersionUpgrade
           - TestMaterialize
           - TestLocalArtifactMirror
+          - TestSingleNodeAirgapInstallationUbuntuJammy
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -147,5 +163,6 @@ jobs:
     - uses: ./.github/actions/e2e
       with:
         test-name: '${{ matrix.tests }}'
+        airgap-license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_AIRGAP_LICENSE_ID }}
         license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_LICENSE_ID }}
         license: ${{ secrets.STAGING_EMBEDDED_CLUSTER_LICENSE }}

.github/workflows/release-dev.yaml

@@ -49,7 +49,7 @@ jobs:
           REPLICATED_API_TOKEN: ${{ secrets.STAGING_REPLICATED_API_TOKEN }}
           REPLICATED_API_ORIGIN: "https://api.staging.replicated.com/vendor"
         run: |
-          export SHORT_SHA=$(git rev-parse --short=7 HEAD)
+          export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
           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
@@ -61,7 +61,7 @@ jobs:
           replicated release create --yaml-dir e2e/kots-release-upgrade --promote CI --version "${SHORT_SHA}-upgrade"
       - name: Build CI binary
         run: |
-          export SHORT_SHA=$(git rev-parse --short=7 HEAD)
+          export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
           echo "# channel release object" > e2e/kots-release-install/release.yaml
           echo 'channelID: "2cHXb1RCttzpR0xvnNWyaZCgDBP"' >> e2e/kots-release-install/release.yaml
           echo 'appSlug: "embedded-cluster-smoke-test-staging-app"' >> e2e/kots-release-install/release.yaml
@@ -76,10 +76,23 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.STAGING_EMBEDDED_CLUSTER_UPLOAD_IAM_SECRET }}
           AWS_REGION: "us-east-1"
         run: |
-          export SHORT_SHA=$(git rev-parse --short=7 HEAD)
+          export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
           export EC_VERSION="v${SHORT_SHA}"
           ./scripts/cache-files.sh
           ./scripts/create-upgrade-release.sh
+      - name: Create Airgap Release
+        env:
+          REPLICATED_APP: "embedded-cluster-smoke-test-staging-app"
+          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)
+          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
+          
+          rm e2e/kots-release-install/release.yaml
+          replicated release create --yaml-dir e2e/kots-release-install --promote CI-airgap --version "${SHORT_SHA}"
 
       - name: upload binary
         uses: actions/upload-artifact@v4
@@ -114,6 +127,7 @@ jobs:
           - TestOldVersionUpgrade
           - TestMaterialize
           - TestLocalArtifactMirror
+          - TestSingleNodeAirgapInstallationUbuntuJammy
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -125,5 +139,6 @@ jobs:
       - uses: ./.github/actions/e2e
         with:
           test-name: '${{ matrix.tests }}'
+          airgap-license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_AIRGAP_LICENSE_ID }}
           license-id: ${{ secrets.STAGING_EMBEDDED_CLUSTER_LICENSE_ID }}
           license: ${{ secrets.STAGING_EMBEDDED_CLUSTER_LICENSE }}

.gitignore

@@ -1,6 +1,7 @@
 output
 bundle
 pkg/goods/bins
+pkg/goods/internal/bins
 pkg/goods/images
 *tgz
 .pre-commit-config.yaml

Makefile

@@ -4,15 +4,17 @@ 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.1
+ADMIN_CONSOLE_CHART_VERSION = 1.108.3-build.1
 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.25.0
+EMBEDDED_OPERATOR_CHART_VERSION = 0.25.2
+EMBEDDED_OPERATOR_UTILS_IMAGE = busybox:1.36.1
 OPENEBS_CHART_URL = https://openebs.github.io/charts
 OPENEBS_CHART_NAME = openebs/openebs
 OPENEBS_CHART_VERSION = 3.10.0
+OPENEBS_UTILS_VERSION = 4.0.0
 REGISTRY_CHART_URL = https://helm.twun.io
 REGISTRY_CHART_NAME = twuni/docker-registry
 REGISTRY_CHART_VERSION = 2.2.3
@@ -21,6 +23,7 @@ KUBECTL_VERSION = v1.28.7
 K0S_VERSION = v1.28.7+k0s.0
 K0S_BINARY_SOURCE_OVERRIDE =
 TROUBLESHOOT_VERSION = v0.84.1
+KOTS_VERSION = v$(shell echo $(ADMIN_CONSOLE_CHART_VERSION) | sed 's/\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/')
 LD_FLAGS = -X github.com/replicatedhq/embedded-cluster/pkg/defaults.K0sVersion=$(K0S_VERSION) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/defaults.Version=$(VERSION) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/defaults.K0sBinaryURL=$(K0S_BINARY_SOURCE_OVERRIDE) \
@@ -34,9 +37,11 @@ LD_FLAGS = -X github.com/replicatedhq/embedded-cluster/pkg/defaults.K0sVersion=$
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/embeddedclusteroperator.ChartURL=$(EMBEDDED_OPERATOR_CHART_URL) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/embeddedclusteroperator.ChartName=$(EMBEDDED_OPERATOR_CHART_NAME) \
 	-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) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/openebs.ChartURL=$(OPENEBS_CHART_URL) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/openebs.ChartName=$(OPENEBS_CHART_NAME) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/openebs.Version=$(OPENEBS_CHART_VERSION) \
+	-X github.com/replicatedhq/embedded-cluster/pkg/addons/openebs.UtilsVersion=$(OPENEBS_UTILS_VERSION) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/registry.ChartURL=$(REGISTRY_CHART_URL) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/registry.ChartName=$(REGISTRY_CHART_NAME) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/registry.Version=$(REGISTRY_CHART_VERSION) \
@@ -81,6 +86,14 @@ pkg/goods/bins/local-artifact-mirror: Makefile
 	mkdir -p pkg/goods/bins
 	CGO_ENABLED=0 go build -o pkg/goods/bins/local-artifact-mirror ./cmd/local-artifact-mirror
 
+pkg/goods/internal/bins/kubectl-kots: Makefile
+	mkdir -p pkg/goods/internal/bins
+	mkdir -p output/tmp/kots
+	curl -L -o output/tmp/kots/kots.tar.gz https://github.com/replicatedhq/kots/releases/download/$(KOTS_VERSION)/kots_linux_amd64.tar.gz
+	tar -xzf output/tmp/kots/kots.tar.gz -C output/tmp/kots
+	mv output/tmp/kots/kots pkg/goods/internal/bins/kubectl-kots
+	touch pkg/goods/internal/bins/kubectl-kots
+
 output/tmp/release.tar.gz: e2e/kots-release-install/*
 	mkdir -p output/tmp
 	tar -czf output/tmp/release.tar.gz -C e2e/kots-release-install .
@@ -102,7 +115,8 @@ static: pkg/goods/bins/k0s \
 	pkg/goods/bins/kubectl-preflight \
 	pkg/goods/bins/kubectl \
 	pkg/goods/bins/kubectl-support_bundle \
-	pkg/goods/bins/local-artifact-mirror
+	pkg/goods/bins/local-artifact-mirror \
+	pkg/goods/internal/bins/kubectl-kots
 
 .PHONY: embedded-cluster-linux-amd64
 embedded-cluster-linux-amd64: static go.mod