From 5ffc31b774e3ec6aa9f448e372cb10e26a8af3d7 Mon Sep 17 00:00:00 2001 From: Alexandr Demicev Date: Tue, 17 Sep 2024 09:02:30 +0200 Subject: [PATCH 1/2] Add images overrides for vsphere and azure Signed-off-by: Alexandr Demicev --- .../templates/clusterctl-config.yaml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/charts/rancher-turtles/templates/clusterctl-config.yaml b/charts/rancher-turtles/templates/clusterctl-config.yaml index b1f0f193..b6c4be27 100644 --- a/charts/rancher-turtles/templates/clusterctl-config.yaml +++ b/charts/rancher-turtles/templates/clusterctl-config.yaml @@ -17,23 +17,17 @@ data: url: "https://github.com/rancher-sandbox/cluster-api-provider-aws/releases/v2.6.1/infrastructure-components.yaml" type: "InfrastructureProvider" - name: "azure" - url: "https://github.com/kubernetes-sigs/cluster-api-provider-azure/releases/v1.16.0/infrastructure-components.yaml" - type: "InfrastructureProvider" - - name: "docker" - url: "https://github.com/kubernetes-sigs/cluster-api/releases/v1.7.3/infrastructure-components-development.yaml" - type: "InfrastructureProvider" - - name: "gcp" - url: "https://github.com/kubernetes-sigs/cluster-api-provider-gcp/releases/v1.7.0/infrastructure-components.yaml" + url: "https://github.com/rancher-sandbox/cluster-api-provider-azure/releases/v1.16.1/infrastructure-components.yaml" type: "InfrastructureProvider" - name: "vsphere" - url: "https://github.com/kubernetes-sigs/cluster-api-provider-vsphere/releases/v1.10.2/infrastructure-components.yaml" - type: "InfrastructureProvider" - - name: "digitalocean" - url: "https://github.com/kubernetes-sigs/cluster-api-provider-digitalocean/releases/v1.6.0/infrastructure-components.yaml" + url: "https://github.com/rancher-sandbox/cluster-api-provider-vsphere/releases/v1.11.0/infrastructure-components.yaml" type: "InfrastructureProvider" - name: "elemental" url: "https://github.com/rancher-sandbox/cluster-api-provider-elemental/releases/v0.6.0/infrastructure-components.yaml" type: "InfrastructureProvider" + - name: "docker" + url: "https://github.com/kubernetes-sigs/cluster-api/releases/v1.7.3/infrastructure-components-development.yaml" + type: "InfrastructureProvider" # Bootstrap providers - name: "kubeadm" From b6059cde1fb96999dbf78cad54f770bd4d84fa50 Mon Sep 17 00:00:00 2001 From: Alexandr Demicev Date: Tue, 17 Sep 2024 09:04:51 +0200 Subject: [PATCH 2/2] Add CAPI operator image override Signed-off-by: Alexandr Demicev --- charts/rancher-turtles/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/rancher-turtles/values.yaml b/charts/rancher-turtles/values.yaml index b5ca6a93..5d3ed294 100644 --- a/charts/rancher-turtles/values.yaml +++ b/charts/rancher-turtles/values.yaml @@ -39,6 +39,9 @@ cluster-api-operator: - name: clusterctl-config configMap: name: clusterctl-config + image: + manager: + repository: registry.rancher.com/rancher/cluster-api-operator volumeMounts: manager: - mountPath: /tmp/k8s-webhook-server/serving-certs