chore: update k0s images

.github/workflows/ci.yaml

@@ -98,7 +98,7 @@ jobs:
 
   build-current:
     name: Build current
-    runs-on: ubuntu-latest
+    runs-on: embedded-cluster
     needs:
       - git-sha
     outputs:
@@ -122,18 +122,10 @@ jobs:
           go-version-file: go.mod
           cache-dependency-path: "**/*.sum"
 
-      - name: Cache melange
-        uses: actions/cache@v4
-        with:
-          path: |
-            local-artifact-mirror/cache/.melange-cache
-            operator/cache/.melange-cache
-          key: melange-cache
-
-      - name: Setup melange
-        uses: ./.github/actions/setup-melange
-        with:
-          setup-go: false
+      - name: Install dagger
+        run: |
+          curl -fsSL https://dl.dagger.io/dagger/install.sh | sh
+          sudo mv ./bin/dagger /usr/local/bin/dagger
 
       - name: Build
         env:
@@ -174,7 +166,7 @@ jobs:
 
   build-previous-k0s:
     name: Build previous k0s
-    runs-on: ubuntu-latest
+    runs-on: embedded-cluster
     needs:
       - git-sha
     outputs:
@@ -198,18 +190,10 @@ jobs:
           go-version-file: go.mod
           cache-dependency-path: "**/*.sum"
 
-      - name: Cache melange
-        uses: actions/cache@v4
-        with:
-          path: |
-            local-artifact-mirror/cache/.melange-cache
-            operator/cache/.melange-cache
-          key: melange-cache
-
-      - name: Setup melange
-        uses: ./.github/actions/setup-melange
-        with:
-          setup-go: false
+      - name: Install dagger
+        run: |
+          curl -fsSL https://dl.dagger.io/dagger/install.sh | sh
+          sudo mv ./bin/dagger /usr/local/bin/dagger
 
       - name: Build
         env:
@@ -248,7 +232,7 @@ jobs:
 
   build-upgrade:
     name: Build upgrade
-    runs-on: ubuntu-latest
+    runs-on: embedded-cluster
     needs:
       - git-sha
     outputs:
@@ -272,18 +256,10 @@ jobs:
           go-version-file: go.mod
           cache-dependency-path: "**/*.sum"
 
-      - name: Cache melange
-        uses: actions/cache@v4
-        with:
-          path: |
-            local-artifact-mirror/cache/.melange-cache
-            operator/cache/.melange-cache
-          key: melange-cache
-
-      - name: Setup melange
-        uses: ./.github/actions/setup-melange
-        with:
-          setup-go: false
+      - name: Install dagger
+        run: |
+          curl -fsSL https://dl.dagger.io/dagger/install.sh | sh
+          sudo mv ./bin/dagger /usr/local/bin/dagger
 
       - name: Build
         env:

.github/workflows/image-deps-updater.yaml

@@ -80,6 +80,7 @@ jobs:
         INPUT_VELERO_AWS_PLUGIN_VERSION: ${{ github.event.inputs.velero_aws_plugin_version }}
         INPUT_KUBECTL_VERSION: ${{ github.event.inputs.kubectl_version }}
         INPUT_SEAWEEDFS_VERSION: ${{ github.event.inputs.seaweedfs_version }}
+        ARCHS: "amd64,arm64"
       run: |
         chmod +x ./output/bin/buildtools
         ./output/bin/buildtools update images ${{ matrix.addon }}

.github/workflows/image-scan.yaml

@@ -28,27 +28,21 @@ jobs:
         with:
           fetch-depth: 0 # fetch all history so that we can get the previous tag
 
-      - name: Cache Melange
-        uses: actions/cache@v4
-        with:
-          path: |
-            local-artifact-mirror/cache/.melange-cache
-            operator/cache/.melange-cache
-          key: melange-cache
-
-      - name: Setup melange
-        uses: ./.github/actions/setup-melange
+      - name: Install dagger
+        run: |
+          curl -fsSL https://dl.dagger.io/dagger/install.sh | sh
+          sudo mv ./bin/dagger /usr/local/bin/dagger
 
       - name: Build and push local-artifact-mirror image
         id: local-artifact-mirror
         run: |
-          make -C local-artifact-mirror apko build-ttl.sh
+          make -C local-artifact-mirror build-ttl.sh
           echo "image=$(cat local-artifact-mirror/build/image)" >> $GITHUB_OUTPUT
 
       - name: Build and push operator image
         id: operator
         run: |
-          make -C operator apko build-ttl.sh build-chart-ttl.sh
+          make -C operator build-ttl.sh build-chart-ttl.sh
           echo "image=$(cat operator/build/image)" >> $GITHUB_OUTPUT
           echo "chart=$(cat operator/build/chart)" >> $GITHUB_OUTPUT
 

.github/workflows/release-prod.yaml

@@ -59,24 +59,19 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Cache Melange
-        uses: actions/cache@v4
-        with:
-          path: |
-            operator/cache/.melange-cache
-          key: melange-cache
-
-      - name: Setup melange
-        uses: ./.github/actions/setup-melange
+      - name: Install dagger
+        run: |
+          curl -fsSL https://dl.dagger.io/dagger/install.sh | sh
+          sudo mv ./bin/dagger /usr/local/bin/dagger
 
       - name: Build and push operator image
         id: operator-image
         env:
-          REGISTRY: docker.io
-          USERNAME: ${{ secrets.DOCKERHUB_USER }}
-          PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          REGISTRY_SERVER: docker.io
+          REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USER }}
+          REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
         run: |
-          make -C operator apko apko-login build-and-push-operator-image \
+          make -C operator build-and-push-operator-image \
             PACKAGE_VERSION=${{ needs.get-tag.outputs.tag-name }}
           echo "image=$(cat operator/build/image)" >> $GITHUB_OUTPUT
 
@@ -109,24 +104,19 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Cache Melange
-        uses: actions/cache@v4
-        with:
-          path: |
-            local-artifact-mirror/cache/.melange-cache
-          key: melange-cache
-
-      - name: Setup melange
-        uses: ./.github/actions/setup-melange
+      - name: Install dagger
+        run: |
+          curl -fsSL https://dl.dagger.io/dagger/install.sh | sh
+          sudo mv ./bin/dagger /usr/local/bin/dagger
 
       - name: Build and push local-artifact-mirror image
         id: local-artifact-mirror
         env:
-          REGISTRY: docker.io
-          USERNAME: ${{ secrets.DOCKERHUB_USER }}
-          PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          REGISTRY_SERVER: docker.io
+          REGISTRY_USERNAME: ${{ secrets.DOCKERHUB_USER }}
+          REGISTRY_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
         run: |
-          make -C local-artifact-mirror apko apko-login build-and-push-local-artifact-mirror-image \
+          make -C local-artifact-mirror build-and-push-local-artifact-mirror-image \
             PACKAGE_VERSION=${{ needs.get-tag.outputs.tag-name }}
           echo "image=$(cat local-artifact-mirror/build/image)" >> $GITHUB_OUTPUT
 

.github/workflows/update-addons.yaml

@@ -69,6 +69,7 @@ jobs:
           INPUT_OPENEBS_CHART_VERSION: ${{ github.event.inputs.openebs_chart_version }}
           INPUT_VELERO_CHART_VERSION: ${{ github.event.inputs.velero_chart_version }}
           INPUT_SEAWEEDFS_CHART_VERSION: ${{ github.event.inputs.seaweedfs_chart_version }}
+          ARCHS: "amd64,arm64"
         run: |
           chmod 755 ./output/bin/buildtools
           ./output/bin/buildtools update addon ${{ matrix.addon }}

.gitignore

@@ -14,3 +14,5 @@ go.work
 go.work.sum
 .gocache
 .gomodcache
+/local-dev/
+*.tmp

Makefile

@@ -12,7 +12,7 @@ K0S_GO_VERSION = v1.29.8+k0s.0
 PREVIOUS_K0S_VERSION ?= v1.28.10+k0s.0
 K0S_BINARY_SOURCE_OVERRIDE =
 PREVIOUS_K0S_BINARY_SOURCE_OVERRIDE =
-TROUBLESHOOT_VERSION = v0.100.0
+TROUBLESHOOT_VERSION = v0.102.0
 KOTS_VERSION = v$(shell awk '/^version/{print $$2}' pkg/addons/adminconsole/static/metadata.yaml | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/')
 # When updating KOTS_BINARY_URL_OVERRIDE, also update the KOTS_VERSION above or
 # scripts/ci-upload-binaries.sh may find the version in the cache and not upload the overridden binary.
@@ -219,11 +219,11 @@ vet: static
 
 .PHONY: e2e-tests
 e2e-tests: embedded-release
-	go test -timeout 60m -parallel 1 -failfast -v ./e2e
+	go test -timeout 60m -ldflags="$(LD_FLAGS)" -parallel 1 -failfast -v ./e2e
 
 .PHONY: e2e-test
 e2e-test:
-	go test -timeout 60m -v ./e2e -run $(TEST_NAME)$
+	go test -timeout 60m -ldflags="$(LD_FLAGS)" -v ./e2e -run $(TEST_NAME)$
 
 .PHONY: build-ttl.sh
 build-ttl.sh:
@@ -269,6 +269,7 @@ list-distros:
 
 .PHONY: create-node%
 create-node%: DISTRO = debian-bookworm
+create-node%: NODE_PORT = 30000
 create-node%:
 	@if ! docker images | grep -q ec-$(DISTRO); then \
 		$(MAKE) -C dev/distros build-$(DISTRO); \
@@ -282,7 +283,7 @@ create-node%:
 		-v /var/lib/k0s \
 		-v $(shell pwd):/replicatedhq/embedded-cluster \
 		-v $(shell dirname $(shell pwd))/kots:/replicatedhq/kots \
-		$(if $(filter node0,node$*),-p 30000:30000) \
+		$(if $(filter node0,node$*),-p $(NODE_PORT):$(NODE_PORT)) \
 		ec-$(DISTRO)
 
 	@$(MAKE) ssh-node$*