rancher-turtles: ensure downstream images are used

The current clusterctl override is not working ref this fix: kubernetes-sigs/cluster-api-operator#598
suse-edge · Sep 4, 2024 · 68be959 · 68be959
1 parent f1a61c6
commit 68be959
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/packages/rancher-turtles/generated-changes/patch/templates/clusterctl-config.yaml.patch b/packages/rancher-turtles/generated-changes/patch/templates/clusterctl-config.yaml.patch
@@ -1,12 +1,6 @@
 --- charts-original/templates/clusterctl-config.yaml
 +++ charts/templates/clusterctl-config.yaml
-@@ -6,50 +6,32 @@
-   namespace: '{{ .Values.rancherTurtles.namespace }}'
- data:
-   clusterctl.yaml: |
-+    images:
-+      all:
-+        repository: registry.opensuse.org/isv/suse/edge/clusterapi/containers/images
+@@ -9,47 +9,26 @@
      providers:
      # Cluster API core provider
      - name:         "cluster-api"

diff --git a/packages/rancher-turtles/generated-changes/patch/values.yaml.patch b/packages/rancher-turtles/generated-changes/patch/values.yaml.patch
@@ -15,7 +15,28 @@
      rancher-kubeconfigs:
        label: false
      managementv3-cluster:
-@@ -72,3 +72,12 @@
+@@ -53,7 +53,7 @@
+       defaultName: capi-env-variables
+     core:
+       namespace: capi-system
+-      imageUrl: ""
++      imageUrl: "registry.opensuse.org/isv/suse/edge/clusterapi/containers/images/cluster-api-controller:1.7.5"
+       fetchConfig:
+         url: ""
+         selector: ""
+@@ -62,13 +62,22 @@
+       version: ""
+       bootstrap:
+         namespace: rke2-bootstrap-system
+-        imageUrl: ""
++        imageUrl: "registry.opensuse.org/isv/suse/edge/clusterapi/containers/images/cluster-api-provider-rke2-bootstrap:0.6.1"
+         fetchConfig:
+           url: ""
+           selector: ""
+       controlPlane:
+         namespace: rke2-control-plane-system
+-        imageUrl: ""
++        imageUrl: "registry.opensuse.org/isv/suse/edge/clusterapi/containers/images/cluster-api-provider-rke2-controlplane:0.6.1"
          fetchConfig:
            url: ""
            selector: ""
@@ -24,7 +45,7 @@
 +      version: ""
 +      infrastructure:
 +        namespace: capm3-system
-+        imageUrl: ""
++        imageUrl: "registry.opensuse.org/isv/suse/edge/clusterapi/containers/images/cluster-api-provider-metal3:1.7.1"
 +        fetchConfig:
 +          url: ""
 +          selector: ""