Skip to content

Commit f9503e9

Browse files
committed
fix(cilium): rebuild image multi-arch and pin tag to 1.19.3
The previous image digest in values.yaml pointed at a single-arch linux/arm64 manifest because 'make image' was run from an arm64 host with the default buildx platform. Cozystack targets amd64 (Talos build output, E2E runners, most real-world clusters) and also arm64 for hybrid fleets, so Helm install would fail on amd64 nodes with 'no matching manifest for linux/amd64 in the manifest list entries' whenever somebody installed directly from this commit between merge and the next release-tag CI rebuild. Two changes: - packages/system/cilium/Makefile: set PLATFORM ?= linux/amd64,linux/arm64 before including common-envs.mk so any future 'make image' run produces a multi-arch manifest by default, regardless of the host architecture. Explicit overrides from the environment or command line still win thanks to ?=. - packages/system/cilium/values.yaml: digest refreshed to the new multi-arch manifest list (verified via docker manifest inspect: amd64 sha256:e1977323..., arm64 sha256:8f5ab529...). Tag bumped from 'latest' (which was emitted by the common-envs.mk settag macro on a non-tagged checkout) to '1.19.3' to match the established convention in every other packages/system/*/values.yaml — human-readable version anchor for reviewers and incident response, independent of digest chasing. Assisted-By: Claude <[email protected]> Signed-off-by: Aleksei Sviridkin <[email protected]>
1 parent a78505e commit f9503e9

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

‎packages/system/cilium/Makefile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ CILIUM_TAG=$(shell awk '$$1 == "version:" {print $$2}' charts/cilium/Chart.yaml)
33
export NAME=cilium
44
export NAMESPACE=cozy-$(NAME)
55

6+
# Cilium runs on every cluster node, so the mirrored image must cover every
7+
# architecture Cozystack supports. Setting PLATFORM here before the common
8+
# envs include pins the default without breaking an explicit override from
9+
# the environment or a command-line argument.
10+
PLATFORM ?= linux/amd64,linux/arm64
11+
612
include ../../../hack/common-envs.mk
713
include ../../../hack/package.mk
814

‎packages/system/cilium/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ cilium:
1515
mode: "kubernetes"
1616
image:
1717
repository: ghcr.io/cozystack/cozystack/cilium
18-
tag: latest
19-
digest: "sha256:8f5ab52982fc848ee098ff89919e3528aa8f3a553b82106a25149dcd0b87ea7e"
18+
tag: 1.19.3
19+
digest: "sha256:700f06f4803a838a8e830be5ace4650e3ad82bdefabfb2f4d110368d307a5efb"
2020
envoy:
2121
enabled: false
2222
rollOutCiliumPods: true

0 commit comments

Comments
 (0)