From 9c37908b9233d7532969e2d267d7ad27f08ab26d Mon Sep 17 00:00:00 2001 From: Vivien Bakke Date: Tue, 24 Sep 2024 11:44:48 +0200 Subject: [PATCH] fix: vsphere cpi image repo --- docs/CSI/vsphere-csi.md | 2 +- inventory/sample/group_vars/all/vsphere.yml | 4 ++-- .../external-vsphere-cloud-controller-manager-ds.yml.j2 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/CSI/vsphere-csi.md b/docs/CSI/vsphere-csi.md index 0e4f1625356..564faae0a11 100644 --- a/docs/CSI/vsphere-csi.md +++ b/docs/CSI/vsphere-csi.md @@ -24,7 +24,7 @@ You need to source the vSphere credentials you use to deploy your machines that | external_vsphere_datacenter | TRUE | string | | | Datacenter name to use | | external_vsphere_kubernetes_cluster_id | TRUE | string | | "kubernetes-cluster-id" | Kubernetes cluster ID to use | | external_vsphere_version | TRUE | string | | "7.0u1" | Vmware Vsphere version where located all VMs | -| external_vsphere_cloud_controller_image_tag | TRUE | string | | "latest" | Kubernetes cluster ID to use | +| external_vsphere_cloud_controller_image_tag | TRUE | string | | "v1.31.0" | CPI manager image tag to use | | vsphere_syncer_image_tag | TRUE | string | | "v3.1.1" | Syncer image tag to use | | vsphere_csi_attacher_image_tag | TRUE | string | | "v4.3.0" | CSI attacher image tag to use | | vsphere_csi_controller | TRUE | string | | "v3.1.1" | CSI controller image tag to use | diff --git a/inventory/sample/group_vars/all/vsphere.yml b/inventory/sample/group_vars/all/vsphere.yml index 697c6310425..591545f976f 100644 --- a/inventory/sample/group_vars/all/vsphere.yml +++ b/inventory/sample/group_vars/all/vsphere.yml @@ -11,8 +11,8 @@ # external_vsphere_version: "6.7u3" ## Tags for the external vSphere Cloud Provider images -## gcr.io/cloud-provider-vsphere/cpi/release/manager -# external_vsphere_cloud_controller_image_tag: "latest" +## registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere +# external_vsphere_cloud_controller_image_tag: "v1.31.0" ## registry.k8s.io/csi-vsphere/syncer # vsphere_syncer_image_tag: "v3.1.1" ## registry.k8s.io/sig-storage/csi-attacher diff --git a/roles/kubernetes-apps/external_cloud_controller/vsphere/templates/external-vsphere-cloud-controller-manager-ds.yml.j2 b/roles/kubernetes-apps/external_cloud_controller/vsphere/templates/external-vsphere-cloud-controller-manager-ds.yml.j2 index 05e4ac300da..94340996424 100644 --- a/roles/kubernetes-apps/external_cloud_controller/vsphere/templates/external-vsphere-cloud-controller-manager-ds.yml.j2 +++ b/roles/kubernetes-apps/external_cloud_controller/vsphere/templates/external-vsphere-cloud-controller-manager-ds.yml.j2 @@ -36,7 +36,7 @@ spec: serviceAccountName: cloud-controller-manager containers: - name: vsphere-cloud-controller-manager - image: {{ gcr_image_repo }}/cloud-provider-vsphere/cpi/release/manager:{{ external_vsphere_cloud_controller_image_tag }} + image: {{ kube_image_repo }}/cloud-pv-vsphere/cloud-provider-vsphere:{{ external_vsphere_cloud_controller_image_tag }} args: - --v=2 - --cloud-provider=vsphere