Merge pull request #746 from alexander-demicev/images

Add CAPV, CAPZ and CAPI operator images
rancher · Sep 17, 2024 · 89626da · 89626da
2 parents bb7b790 + b6059cd
commit 89626da
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git 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"

diff --git 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