Skip to content

Commit 7686829

Browse files
committed
rancher-turtles: ensure downstream images are used
The current clusterctl override is not working ref this fix: kubernetes-sigs/cluster-api-operator#598
1 parent 99c04bd commit 7686829

File tree

2 files changed

+24
-9
lines changed

2 files changed

+24
-9
lines changed

packages/rancher-turtles/generated-changes/patch/templates/clusterctl-config.yaml.patch

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
--- charts-original/templates/clusterctl-config.yaml
22
+++ charts/templates/clusterctl-config.yaml
3-
@@ -6,50 +6,32 @@
4-
namespace: '{{ .Values.rancherTurtles.namespace }}'
5-
data:
6-
clusterctl.yaml: |
7-
+ images:
8-
+ all:
9-
+ repository: registry.opensuse.org/isv/suse/edge/clusterapi/containers/images
3+
@@ -9,47 +9,26 @@
104
providers:
115
# Cluster API core provider
126
- name: "cluster-api"

packages/rancher-turtles/generated-changes/patch/values.yaml.patch

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,28 @@
1515
rancher-kubeconfigs:
1616
label: false
1717
managementv3-cluster:
18-
@@ -72,3 +72,12 @@
18+
@@ -53,7 +53,7 @@
19+
defaultName: capi-env-variables
20+
core:
21+
namespace: capi-system
22+
- imageUrl: ""
23+
+ imageUrl: "registry.opensuse.org/isv/suse/edge/clusterapi/containers/images/cluster-api-controller:1.7.5"
24+
fetchConfig:
25+
url: ""
26+
selector: ""
27+
@@ -62,13 +62,22 @@
28+
version: ""
29+
bootstrap:
30+
namespace: rke2-bootstrap-system
31+
- imageUrl: ""
32+
+ imageUrl: "registry.opensuse.org/isv/suse/edge/clusterapi/containers/images/cluster-api-provider-rke2-bootstrap:0.6.1"
33+
fetchConfig:
34+
url: ""
35+
selector: ""
36+
controlPlane:
37+
namespace: rke2-control-plane-system
38+
- imageUrl: ""
39+
+ imageUrl: "registry.opensuse.org/isv/suse/edge/clusterapi/containers/images/cluster-api-provider-rke2-controlplane:0.6.1"
1940
fetchConfig:
2041
url: ""
2142
selector: ""
@@ -24,7 +45,7 @@
2445
+ version: ""
2546
+ infrastructure:
2647
+ namespace: capm3-system
27-
+ imageUrl: ""
48+
+ imageUrl: "registry.opensuse.org/isv/suse/edge/clusterapi/containers/images/cluster-api-provider-metal3:1.7.1"
2849
+ fetchConfig:
2950
+ url: ""
3051
+ selector: ""

0 commit comments

Comments
 (0)