Skip to content

Commit 29bf56f

Browse files
authored
chore(images): bump opencost, multus, clickhouse-backup (#2900 partial) (#3000)
## What this PR does Bumps three of the small components listed in #2900, each picking up published security fixes: - **opencost** chart `1.41.0 → 2.5.23` (app `1.111.0 → 1.120.3`). The 1.x→2.x chart-major bump's values schema is additive, so the cozystack overrides (external prometheus vmselect endpoint, customPricing) stay valid. The Makefile now pins `--version 2.5.23` and drops the upstream snapshot test suite (it can't resolve in the cozystack render context); cozystack ships its own helm-unittest. - **multus-cni** `v4.2.3 → v4.3.0`, rebuilt multi-arch (builder `golang:1.24 → 1.26` for the Go-stdlib CVEs). This also **folds the `multusMasterCNI: 05-cilium.conflist` CNI-ordering fix into `customize-deployment.patch`** — it was previously a raw daemonset hand-edit that the next `make update` would have wiped, re-introducing the kube-ovn-before-cilium startup race. A new helm-unittest pins it. - **clickhouse-backup tool** `altinity/clickhouse-backup 2.6.32 → 2.7.2`, rebuilt multi-arch. The separate `clickhouse-backup` image (clickhouse-server base) and the managed clickhouse-server version are intentionally left as-is (multi-major server upgrade, out of scope). Each package gains helm-unittest coverage (none shipped before). **Deferred from #2900 (this PR does NOT close the issue):** - **bootbox** — already at the latest upstream tag (no-op). - **kubeovn-plunger** — first-party cozystack component, no upstream release to bump. - **etcd-operator** — held at 0.4.5: the 0.5.x Helm chart is not published on the `ghcr.io/aenix-io/charts` OCI registry yet (only GitHub releases exist), so `helm pull` can't fetch it. Needs an aenix-io chart publish first. - **ingress-nginx** — deliberately pinned to 4.11.2 (revert `5c900a746` after the CVE-2025-1974 mitigation attempt); bumping needs a separate investigation, not a routine sweep. ### Release note ```release-note chore(images): bump opencost to 2.5.23, multus-cni to v4.3.0, and clickhouse-backup to 2.7.2 ``` <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Enhanced OpenCost Helm support for plugin installation/config validation, cloud integration (secret or JSON), MCP server, and `extraObjects` rendering * Added admin token secret creation and Pod Disruption Budget options * Expanded UI/API/MCP exposure via Ingress, OpenShift Route, and Gateway API HTTPRoute * Improved internal Prometheus/Thanos endpoint handling and optional CA trust update * **Updates** * Updated ClickHouse backup and Multus images; adjusted Multus “thick” deployment behavior/resources and namespace usage * Refreshed OpenCost chart values/docs and bumped chart/app versions * **Tests** * Added/extended Helm unittest suites and rendering invariants for backup, Multus, and OpenCost <!-- end of auto-generated comment: release notes by coderabbit.ai -->
2 parents a74b618 + 7532cf5 commit 29bf56f

38 files changed

Lines changed: 1517 additions & 137 deletions
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ghcr.io/cozystack/cozystack/altinity-clickhouse-backup:v1.5.0@sha256:65d15779d062680ddb69210c1dfaf8920ea4be2beb069d028bcb5934870a4d72
1+
ghcr.io/cozystack/cozystack/altinity-clickhouse-backup:v1.5.0@sha256:4206ff2bacffa05658eca9eb7305a153d0a8f3461cbed5508de66eb06fdc4e88
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM altinity/clickhouse-backup:2.6.32
1+
FROM altinity/clickhouse-backup:2.7.2

‎packages/apps/clickhouse/tests/backup_test.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ tests:
3434
enabled: true
3535
useSystemBucket: true
3636
asserts:
37+
- matchRegex:
38+
# The tag tracks the cozystack release version (re-pinned by
39+
# release-prep), so pin the cozystack-built repository rather than
40+
# the volatile tag. The upstream altinity version lives in the image
41+
# Dockerfile.
42+
path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse-backup")].image
43+
pattern: '^ghcr\.io/cozystack/cozystack/altinity-clickhouse-backup:'
3744
- equal:
3845
path: spec.templates.podTemplates[0].spec.containers[?(@.name=="clickhouse-backup")].env[?(@.name=="S3_PATH")].value
3946
value: tenant-test/ch-test

‎packages/system/multus/Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ export NAMESPACE=cozy-$(NAME)
44
include ../../../hack/common-envs.mk
55
include ../../../hack/package.mk
66

7+
test:
8+
helm unittest .
9+
710
update:
811
rm -rf templates
912
mkdir templates

‎packages/system/multus/images/multus-cni/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM --platform=$BUILDPLATFORM golang:1.24 AS build
1+
FROM --platform=$BUILDPLATFORM golang:1.26 AS build
22

3-
ARG VERSION=v4.2.3
3+
ARG VERSION=v4.3.0
44
ARG TARGETPLATFORM
55

66
WORKDIR /usr/src/multus-cni

‎packages/system/multus/patches/customize-deployment.patch‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/packages/system/multus/templates/multus-daemonset-thick.yml
22
+++ b/packages/system/multus/templates/multus-daemonset-thick.yml
3-
@@ -93,19 +93,19 @@ roleRef:
3+
@@ -94,19 +94,19 @@
44
subjects:
55
- kind: ServiceAccount
66
name: multus
@@ -23,7 +23,14 @@
2323
labels:
2424
tier: node
2525
app: multus
26-
@@ -125,8 +125,8 @@ data:
26+
@@ -120,14 +120,15 @@
27+
"cniConfigDir": "/host/etc/cni/net.d",
28+
"multusAutoconfigDir": "/host/etc/cni/net.d",
29+
"multusConfigFile": "auto",
30+
+ "multusMasterCNI": "05-cilium.conflist",
31+
"socketDir": "/host/run/multus/"
32+
}
33+
---
2734
apiVersion: apps/v1
2835
kind: DaemonSet
2936
metadata:
@@ -34,7 +41,7 @@
3441
labels:
3542
tier: node
3643
app: multus
37-
@@ -159,10 +159,9 @@ spec:
44+
@@ -160,10 +161,9 @@
3845
resources:
3946
requests:
4047
cpu: "100m"

‎packages/system/multus/templates/multus-daemonset-thick.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ spec:
1919
singular: network-attachment-definition
2020
kind: NetworkAttachmentDefinition
2121
shortNames:
22+
- nad
2223
- net-attach-def
2324
versions:
2425
- name: v1
@@ -155,7 +156,7 @@ spec:
155156
serviceAccountName: multus
156157
containers:
157158
- name: kube-multus
158-
image: ghcr.io/cozystack/cozystack/multus-cni:v1.5.0@sha256:f41d0d45bb3a654a6f024a8e416884541550f4c70481f1579647c6dd434f04d8
159+
image: ghcr.io/cozystack/cozystack/multus-cni:v1.5.0@sha256:e006fe695d31c0ae57efbea7361eee0aa532c53e776f97285ae30e963b7dc764
159160
command: [ "/usr/src/multus-cni/bin/multus-daemon" ]
160161
resources:
161162
requests:
@@ -201,7 +202,7 @@ spec:
201202
fieldPath: spec.nodeName
202203
initContainers:
203204
- name: install-multus-binary
204-
image: ghcr.io/cozystack/cozystack/multus-cni:v1.5.0@sha256:f41d0d45bb3a654a6f024a8e416884541550f4c70481f1579647c6dd434f04d8
205+
image: ghcr.io/cozystack/cozystack/multus-cni:v1.5.0@sha256:e006fe695d31c0ae57efbea7361eee0aa532c53e776f97285ae30e963b7dc764
205206
command:
206207
- "/usr/src/multus-cni/bin/install_multus"
207208
- "-d"
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
suite: cozy-multus daemonset invariants
2+
release:
3+
name: multus
4+
namespace: cozy-multus
5+
tests:
6+
# The daemonset image tag tracks the cozystack release version and is
7+
# re-pinned by release-prep, so pin the repository (cozystack-built, not the
8+
# upstream k8snetworkplumbingwg image) rather than the volatile tag.
9+
- it: runs the cozystack-built multus image
10+
template: templates/multus-daemonset-thick.yml
11+
documentSelector:
12+
path: kind
13+
value: DaemonSet
14+
asserts:
15+
- matchRegex:
16+
path: spec.template.spec.containers[0].image
17+
pattern: '^ghcr\.io/cozystack/cozystack/multus-cni:'
18+
19+
# Guards the cozystack CNI-ordering fix (multusMasterCNI pinned to the cilium
20+
# conflist) so multus does not auto-detect kube-ovn ahead of cilium at node
21+
# startup and bypass the cilium CNI chain. This is a hand-edit that lives in
22+
# patches/customize-deployment.patch so it survives every make update.
23+
- it: pins the master CNI to the cilium conflist
24+
template: templates/multus-daemonset-thick.yml
25+
documentSelector:
26+
path: kind
27+
value: ConfigMap
28+
asserts:
29+
- matchRegex:
30+
path: data["daemon-config.json"]
31+
pattern: '"multusMasterCNI": "05-cilium\.conflist"'

‎packages/system/opencost/Makefile‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,15 @@ export NAMESPACE=cozy-$(NAME)
33

44
include ../../../hack/package.mk
55

6+
test:
7+
helm unittest .
8+
69
update:
710
rm -rf charts
811
helm repo add opencost-charts https://opencost.github.io/opencost-helm-chart
912
helm repo update opencost-charts
10-
helm pull opencost-charts/opencost --untar --untardir charts
13+
helm pull opencost-charts/opencost --untar --untardir charts --version 2.5.23
14+
# Drop the upstream chart's own helm-unittest suite: it is snapshot-based
15+
# and fails in the cozystack render context (configsChecksum can't resolve
16+
# the custom-pricing configmap glob). cozystack ships its own tests/.
17+
rm -rf charts/opencost/tests
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: 1.111.0
2+
appVersion: 1.120.3
33
description: OpenCost and OpenCost UI
44
home: https://github.com/opencost/opencost-helm-chart
55
keywords:
@@ -9,11 +9,11 @@ keywords:
99
- monitoring
1010
- opencost
1111
maintainers:
12-
- name: mattray
13-
url: https://mattray.dev
12+
- name: jessegoodier
1413
- name: toscott
14+
- name: mittal-ishaan
1515
1616
name: brito-rafa
1717
name: opencost
1818
type: application
19-
version: 1.41.0
19+
version: 2.5.23

0 commit comments

Comments
 (0)