From b1d6acc08158bd8cb877d78f2f4d0e0b7770193e Mon Sep 17 00:00:00 2001
From: Steven Hardy <steven.hardy@suse.com>
Date: Tue, 3 Sep 2024 16:07:32 +0100
Subject: [PATCH] rancher-turtles: ensure downstream images are used

The current clusterctl override is not working ref this fix:
https://github.com/kubernetes-sigs/cluster-api-operator/pull/598
---
 .../templates/clusterctl-config.yaml.patch    |  9 ++++---
 .../generated-changes/patch/values.yaml.patch | 25 +++++++++++++++++--
 2 files changed, 28 insertions(+), 6 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
index fe95e5d0..6fd9936f 100644
--- 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,13 @@
 --- charts-original/templates/clusterctl-config.yaml
 +++ charts/templates/clusterctl-config.yaml
-@@ -6,50 +6,32 @@
+@@ -6,50 +6,33 @@
    namespace: '{{ .Values.rancherTurtles.namespace }}'
  data:
    clusterctl.yaml: |
-+    images:
-+      all:
-+        repository: registry.opensuse.org/isv/suse/edge/clusterapi/containers/images
++# This currently doesn't work ref https://github.com/kubernetes-sigs/cluster-api-operator/pull/598
++#    images:
++#      all:
++#        repository: registry.opensuse.org/isv/suse/edge/clusterapi/containers/images
      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
index 0e0eb47c..580f142c 100644
--- 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: ""