diff --git a/packages/core/builder/templates/sandbox.yaml b/packages/core/builder/templates/sandbox.yaml index 9189e8b1..0a850cb6 100755 --- a/packages/core/builder/templates/sandbox.yaml +++ b/packages/core/builder/templates/sandbox.yaml @@ -26,7 +26,7 @@ spec: automountServiceAccountToken: false terminationGracePeriodSeconds: 1 containers: - - name: imagere + - name: imager image: "{{ .Values.talos.imager.image }}" securityContext: privileged: true diff --git a/packages/core/builder/values.yaml b/packages/core/builder/values.yaml index 5899a23b..ccebe8fe 100755 --- a/packages/core/builder/values.yaml +++ b/packages/core/builder/values.yaml @@ -1,3 +1,3 @@ talos: imager: - image: ghcr.io/siderolabs/imager:v1.8.4 + image: ghcr.io/kvaps/talos/imager:v1.9.1-1-gac655f2d3-dirty diff --git a/packages/core/installer/Makefile b/packages/core/installer/Makefile index 2f0ef052..caf15bc4 100644 --- a/packages/core/installer/Makefile +++ b/packages/core/installer/Makefile @@ -19,8 +19,8 @@ diff: update: hack/gen-profiles.sh - IMAGE=$$(awk '/^version:/ {print $$2}' images/talos/profiles/installer.yaml) \ - yq -i '.talos.imager.image = "ghcr.io/siderolabs/imager:" + strenv(IMAGE)' ../builder/values.yaml + IMAGE=$$(yq '.input.baseInstaller.imageRef | sub("/installer:", "/imager:")' images/talos/profiles/installer.yaml) \ + yq -i '.talos.imager.image = strenv(IMAGE)' ../builder/values.yaml image: pre-checks image-cozystack image-talos image-matchbox diff --git a/packages/core/testing/Makefile b/packages/core/testing/Makefile index ae8a2f2e..f8f3e5c6 100755 --- a/packages/core/testing/Makefile +++ b/packages/core/testing/Makefile @@ -36,7 +36,10 @@ image-e2e-sandbox: copy-hack-dir: tar -C ../../../ -cf- hack | kubectl exec -i -n $(NAMESPACE) deploy/cozystack-e2e-$(NAME) -- tar -xf- -test: wait-for-sandbox copy-hack-dir ## Run the end-to-end tests in existing sandbox. +copy-image: + cat ../../../_out/assets/nocloud-amd64.raw.xz | kubectl exec -i -n $(NAMESPACE) deploy/cozystack-e2e-$(NAME) -- sh -xec 'xz --decompress > /nocloud-amd64.raw' + +test: wait-for-sandbox copy-hack-dir copy-image ## Run the end-to-end tests in existing sandbox. helm template -n cozy-system installer ../installer | kubectl exec -i -n $(NAMESPACE) deploy/cozystack-e2e-$(NAME) -- sh -c 'cat > /cozystack-installer.yaml' kubectl exec -ti -n $(NAMESPACE) deploy/cozystack-e2e-$(NAME) -- sh -c 'export COZYSTACK_INSTALLER_YAML=$$(cat /cozystack-installer.yaml) && /hack/e2e.sh'