Skip to content

Commit 46b1967

Browse files
committed
chore(kamaji): bump kamaji to 26.6.4-edge
Refreshes the kamaji control-plane manager onto current upstream. - images/kamaji/Dockerfile: ARG VERSION 26.3.5-edge -> 26.6.4-edge. The rebuild on golang:1.26 + distroless/static clears the Go stdlib advisory; the OS-package advisories from the scan apply to a debian-based image, not the distroless manager cozystack actually ships. - charts/: re-vendored from 26.6.4-edge. The TenantControlPlane CRD picks up the upstream dual-stack networking update -- new podCidrs / serviceCidrs array fields alongside the retained singular podCidr / serviceCidr, and the object-level CEL rule tying dnsServiceIPs to the singular serviceCidr replaced by per-field isCIDR validation -- plus an additive securityContext on the konnectivity-server container. These are backward-compatible: existing TenantControlPlanes keep validating (the singular fields stay accepted and the dropped rule only relaxes validation). The new certManager / selfSignedCertificates value blocks default to the chart's existing cert-manager + self-signed-issuer behaviour, so the webhook cert flow is unchanged. kamaji-etcd stays disabled. - values.yaml: re-pinned the image and the --migrate-image arg to the rebuilt multi-arch digest. The fix-kubelet-config-compat patch (k8s 1.35+ kubelet defaults) still applies cleanly on the new source. Assisted-By: Claude <[email protected]> Signed-off-by: Aleksei Sviridkin <[email protected]>
1 parent 0e2e6e1 commit 46b1967

8 files changed

Lines changed: 2037 additions & 33 deletions

File tree

‎packages/system/kamaji/charts/kamaji-crds/hack/kamaji.clastix.io_tenantcontrolplanes_spec.yaml‎

Lines changed: 1010 additions & 12 deletions
Large diffs are not rendered by default.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: kamaji-etcd
33
repository: https://clastix.github.io/charts
4-
version: 0.11.0
5-
digest: sha256:96b4115b8c02f771f809ec1bed3be3a3903e7e8315d6966aa54b0f73230ea421
6-
generated: "2025-07-03T09:19:19.835421461+02:00"
4+
version: 0.15.0
5+
digest: sha256:dffc71b76c5711884d1bb4b66dee859e4dc70b149b02b4d36d0c60d299d7c55a
6+
generated: "2026-05-25T10:39:07.251403781+02:00"

‎packages/system/kamaji/charts/kamaji/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ version: 0.0.0+latest
2121
dependencies:
2222
- name: kamaji-etcd
2323
repository: https://clastix.github.io/charts
24-
version: ">=0.11.0"
24+
version: ">=0.15.0"
2525
condition: kamaji-etcd.deploy
2626
annotations:
2727
catalog.cattle.io/certified: partner

‎packages/system/kamaji/charts/kamaji/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Kubernetes: `>=1.21.0-0`
2222

2323
| Repository | Name | Version |
2424
|------------|------|---------|
25-
| https://clastix.github.io/charts | kamaji-etcd | >=0.11.0 |
25+
| https://clastix.github.io/charts | kamaji-etcd | >=0.15.0 |
2626

2727
[Kamaji](https://github.com/clastix/kamaji) requires a [multi-tenant `etcd`](https://github.com/clastix/kamaji-internal/blob/master/deploy/getting-started-with-kamaji.md#setup-internal-multi-tenant-etcd) cluster.
2828
This Helm Chart starting from v0.1.1 provides the installation of an internal `etcd` in order to streamline the local test. If you'd like to use an externally managed etcd instance, you can specify the overrides and by setting the value `etcd.deploy=false`.
@@ -82,7 +82,7 @@ Here the values you can override:
8282
| image.repository | string | `"clastix/kamaji"` | The container image of the Kamaji controller. |
8383
| image.tag | string | `nil` | Overrides the image tag whose default is the chart appVersion. |
8484
| imagePullSecrets | list | `[]` | |
85-
| kamaji-etcd | object | `{"clusterDomain":"cluster.local","datastore":{"enabled":true,"name":"default"},"deploy":true,"fullnameOverride":"kamaji-etcd"}` | Subchart: See https://github.com/clastix/kamaji-etcd/blob/master/charts/kamaji-etcd/values.yaml |
85+
| kamaji-etcd | object | `{"certManager":{"enabled":true,"issuerRef":{"group":"cert-manager.io","kind":"Issuer","name":"kamaji-selfsigned-issuer"}},"clusterDomain":"cluster.local","datastore":{"enabled":true,"name":"default"},"deploy":true,"fullnameOverride":"kamaji-etcd","selfSignedCertificates":{"enabled":false}}` | Subchart: See https://github.com/clastix/kamaji-etcd/blob/master/charts/kamaji-etcd/values.yaml |
8686
| kubeconfigGenerator.affinity | object | `{}` | Kubernetes affinity rules to apply to Kubeconfig Generator controller pods |
8787
| kubeconfigGenerator.enableLeaderElect | bool | `true` | Enables the leader election. |
8888
| kubeconfigGenerator.enabled | bool | `false` | Toggle to deploy the Kubeconfig Generator Deployment. |

‎packages/system/kamaji/charts/kamaji/crds/kamaji.clastix.io_tenantcontrolplanes.yaml‎

Lines changed: 1010 additions & 12 deletions
Large diffs are not rendered by default.

‎packages/system/kamaji/charts/kamaji/values.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,14 @@ kamaji-etcd:
104104
fullnameOverride: kamaji-etcd
105105
## -- Important, this must match your management cluster's clusterDomain, otherwise the init jobs will fail
106106
clusterDomain: "cluster.local"
107+
selfSignedCertificates:
108+
enabled: false
109+
certManager:
110+
enabled: true
111+
issuerRef:
112+
name: kamaji-selfsigned-issuer
113+
kind: Issuer
114+
group: cert-manager.io
107115
datastore:
108116
enabled: true
109117
name: default

‎packages/system/kamaji/images/kamaji/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Build the manager binary
22
FROM golang:1.26 AS builder
33

4-
ARG VERSION=26.3.5-edge
4+
ARG VERSION=26.6.4-edge
55
ARG TARGETOS
66
ARG TARGETARCH
77

‎packages/system/kamaji/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kamaji:
33
deploy: false
44
image:
55
pullPolicy: IfNotPresent
6-
tag: v1.5.0@sha256:130d5013a9b35be0013b96efefc656210cc30c6fe92a8c39c9d2ab8d47f791e0
6+
tag: v1.5.0@sha256:30f19facd2820e3861d0ae29e2d3462db29b1464c6ba6524056e982a19657ec5
77
repository: ghcr.io/cozystack/cozystack/kamaji
88
resources:
99
limits:
@@ -36,4 +36,4 @@ kamaji:
3636
periodSeconds: 10
3737
timeoutSeconds: 1
3838
extraArgs:
39-
- --migrate-image=ghcr.io/cozystack/cozystack/kamaji:v1.5.0@sha256:130d5013a9b35be0013b96efefc656210cc30c6fe92a8c39c9d2ab8d47f791e0
39+
- --migrate-image=ghcr.io/cozystack/cozystack/kamaji:v1.5.0@sha256:30f19facd2820e3861d0ae29e2d3462db29b1464c6ba6524056e982a19657ec5

0 commit comments

Comments
 (0)