Skip to content

Commit 5f1c2a4

Browse files
authored
talos 1.9 (#578)
- Update Talos v1.9.1 - add: disable-selinux workaround - Replace workaround with patched Talos - Add image testing --------- Signed-off-by: Andrei Kvapil <[email protected]>
1 parent 8cce943 commit 5f1c2a4

4 files changed

Lines changed: 8 additions & 5 deletions

File tree

‎packages/core/builder/templates/sandbox.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
automountServiceAccountToken: false
2727
terminationGracePeriodSeconds: 1
2828
containers:
29-
- name: imagere
29+
- name: imager
3030
image: "{{ .Values.talos.imager.image }}"
3131
securityContext:
3232
privileged: true

‎packages/core/builder/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
talos:
22
imager:
3-
image: ghcr.io/siderolabs/imager:v1.8.4
3+
image: ghcr.io/kvaps/talos/imager:v1.9.1-1-gac655f2d3-dirty

‎packages/core/installer/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ diff:
1919

2020
update:
2121
hack/gen-profiles.sh
22-
IMAGE=$$(awk '/^version:/ {print $$2}' images/talos/profiles/installer.yaml) \
23-
yq -i '.talos.imager.image = "ghcr.io/siderolabs/imager:" + strenv(IMAGE)' ../builder/values.yaml
22+
IMAGE=$$(yq '.input.baseInstaller.imageRef | sub("/installer:", "/imager:")' images/talos/profiles/installer.yaml) \
23+
yq -i '.talos.imager.image = strenv(IMAGE)' ../builder/values.yaml
2424

2525
image: pre-checks image-cozystack image-talos image-matchbox
2626

‎packages/core/testing/Makefile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ image-e2e-sandbox:
3636
copy-hack-dir:
3737
tar -C ../../../ -cf- hack | kubectl exec -i -n $(NAMESPACE) deploy/cozystack-e2e-$(NAME) -- tar -xf-
3838

39-
test: wait-for-sandbox copy-hack-dir ## Run the end-to-end tests in existing sandbox.
39+
copy-image:
40+
cat ../../../_out/assets/nocloud-amd64.raw.xz | kubectl exec -i -n $(NAMESPACE) deploy/cozystack-e2e-$(NAME) -- sh -xec 'xz --decompress > /nocloud-amd64.raw'
41+
42+
test: wait-for-sandbox copy-hack-dir copy-image ## Run the end-to-end tests in existing sandbox.
4043
helm template -n cozy-system installer ../installer | kubectl exec -i -n $(NAMESPACE) deploy/cozystack-e2e-$(NAME) -- sh -c 'cat > /cozystack-installer.yaml'
4144
kubectl exec -ti -n $(NAMESPACE) deploy/cozystack-e2e-$(NAME) -- sh -c 'export COZYSTACK_INSTALLER_YAML=$$(cat /cozystack-installer.yaml) && /hack/e2e.sh'
4245

0 commit comments

Comments
 (0)