Repository navigation
Commit e184ac6
feat(cpprovider): rebuild kamaji control-plane provider from v0.19.0 + patch
Replaces the externally-built v0.16.0-talos-csr-signer.0 fork image
(image and ConfigMap version labels had drifted: image suffix .0,
ConfigMap/Provider suffix .1) with a chart-local build from upstream
v0.19.0 plus a single backport patch:
- new images/cluster-api-control-plane-provider-kamaji/Dockerfile
builds the manager from upstream v0.19.0 with patches/ applied,
on top of distroless/static:nonroot;
- patches/0001-backport-additional-service-ports-pr347.diff brings
upstream PR #347 (AdditionalServicePorts) back to the v1alpha1
schema — upstream merged the feature to v1alpha2 only, but our
chart's KamajiControlPlane is still v1alpha1 to avoid breaking
in-flight tenants;
- new image and update Makefile targets handle build, manifest
regen via kustomize, and components.gz refresh;
- files/control-plane-components.yaml + files/components.gz
regenerated from v0.19.0+patch via make update;
- templates/providers.yaml + templates/configmaps.yaml renamed to
v0.19.0-cozystack.0 (single source of truth, no .0/.1 skew).
Why v0.19.0 instead of master: upstream master (PR #327) renames
api/v1alpha1 -> api/v1alpha2 wholesale, drops v1alpha1 entirely, and
ships no conversion webhook. Adopting it would orphan every existing
v1alpha1 KamajiControlPlane until manual rewrite. Once upstream gives
us either a real migration path or a v1alpha1 served as deprecated
alongside v1alpha2, this Dockerfile + patches can go.
Co-Authored-By: Claude <[email protected]>
Signed-off-by: Andrei Kvapil <[email protected]>1 parent b289e7f commit e184ac6
8 files changed
Lines changed: 2813 additions & 619 deletions
File tree
- packages/system/capi-providers-cpprovider
- files
- images/cluster-api-control-plane-provider-kamaji
- patches
- templates
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| 31 | + | |
31 | 32 | | |
32 | 33 | | |
33 | 34 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
4 | 5 | | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
Binary file not shown.
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
0 commit comments