Skip to content

Commit 9eb3a64

Browse files
committed
fix(foundationdb-operator)!: drop the amd64-only 7.1 init container
Every foundationdb/fdb-kubernetes-monitor 7.1.x tag is a single amd64 image, so on arm64 the operator's 7.1 init container fails with exec format error and the operator pod never starts. No multi-arch 7.1 monitor exists to bump to, and upstream already swaps its own 7.1 client for 7.3 when building the operator for arm64. The vendoring recipe now deletes the 7.1 entry from the upstream chart values, and the committed chart matches its output. A null override in the package values was rejected: Helm 4.2 and later ignore a null the parent chart sets for a subchart key when no user-supplied values reach that subchart (helm/helm#32132), and the platform passes this package none. helm-unittest renders with Helm 3, so the override would stop working on a Flux bump without any test noticing. The app defaults to 7.3.63, which keeps its init container, as does 7.4. BREAKING CHANGE: the operator no longer carries the 7.1 fdbcli and client library, so it can neither manage nor upgrade a FoundationDB cluster pinned to a 7.1.x version. Upgrade such clusters to 7.3 before installing this release. Assisted-by: LLM Signed-off-by: Aleksei Sviridkin <[email protected]>
1 parent 101d1d9 commit 9eb3a64

3 files changed

Lines changed: 13 additions & 10 deletions

File tree

‎packages/system/foundationdb-operator/Makefile‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,10 @@ update:
1919
cp tmp-repo/config/crd/bases/apps.foundationdb.org_foundationdbclusters.yaml charts/fdb-operator/crds/
2020
cp tmp-repo/config/crd/bases/apps.foundationdb.org_foundationdbrestores.yaml charts/fdb-operator/crds/
2121
rm -rf tmp-repo
22-
rm -rf charts/fdb-operator/charts
22+
rm -rf charts/fdb-operator/charts
23+
# Every fdb-kubernetes-monitor 7.1.x image is amd64-only, so the 7.1 init
24+
# container keeps the operator from starting on arm64; upstream itself
25+
# swaps its 7.1 client for 7.3 there. A null in the package values would
26+
# not do: Helm 4.2 and later ignore it when no user-supplied values reach
27+
# the subchart (helm/helm#32132), and the platform supplies none.
28+
yq -i 'del(.initContainers."7.1")' charts/fdb-operator/values.yaml

‎packages/system/foundationdb-operator/charts/fdb-operator/values.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@ image:
44
tag: v2.30.0
55
pullPolicy: IfNotPresent
66
initContainers:
7-
7.1:
8-
image:
9-
repository: foundationdb/fdb-kubernetes-monitor
10-
tag: 7.1.67
11-
pullPolicy: IfNotPresent
127
7.3:
138
image:
149
repository: foundationdb/fdb-kubernetes-monitor

‎packages/system/foundationdb-operator/tests/fdb-operator_test.yaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@ tests:
1616
value: foundationdb/fdb-kubernetes-operator:v2.30.0
1717
# The CVE remediation also rides the init-monitor base images, so
1818
# pin those too — a silent upstream retag would otherwise slip past.
19+
# No 7.1 init container: every fdb-kubernetes-monitor 7.1.x tag is
20+
# a single amd64 manifest, so it keeps the operator off arm64.
21+
- lengthEqual:
22+
path: spec.template.spec.initContainers
23+
count: 2
1924
- equal:
2025
path: spec.template.spec.initContainers[0].image
21-
value: foundationdb/fdb-kubernetes-monitor:7.1.67
22-
- equal:
23-
path: spec.template.spec.initContainers[1].image
2426
value: foundationdb/fdb-kubernetes-monitor:7.3.63
2527
- equal:
26-
path: spec.template.spec.initContainers[2].image
28+
path: spec.template.spec.initContainers[1].image
2729
value: foundationdb/fdb-kubernetes-monitor:7.4.1
2830

2931
- it: renders the operator image in the cozystack globalMode (the shipping config)

0 commit comments

Comments
 (0)