From c27f747cc42559b1b96f9ec5a7a1e30663f0f2fc Mon Sep 17 00:00:00 2001 From: Shawn Warren Date: Tue, 5 Dec 2023 10:10:31 -0600 Subject: [PATCH 1/4] feat: range over datacenters --- charts/rancher-vsphere-cpi/templates/configmap.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/rancher-vsphere-cpi/templates/configmap.yaml b/charts/rancher-vsphere-cpi/templates/configmap.yaml index e09eac8..19ec4da 100644 --- a/charts/rancher-vsphere-cpi/templates/configmap.yaml +++ b/charts/rancher-vsphere-cpi/templates/configmap.yaml @@ -21,8 +21,10 @@ data: vcenter: {{ .host | quote }}: server: {{ .host | quote }} + {{- range $datacenter := .datacenters }} datacenters: - - {{ .datacenters | quote }} + - {{ $datacenter | quote }} + {{- end }} {{- if .labels.generate }} # labels for regions and zones From aca5fdbdc89164b3402e8dcd1896f1c352a7e56a Mon Sep 17 00:00:00 2001 From: Shawn Warren Date: Tue, 5 Dec 2023 10:12:17 -0600 Subject: [PATCH 2/4] convert datacenters to array --- charts/rancher-vsphere-cpi/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rancher-vsphere-cpi/values.yaml b/charts/rancher-vsphere-cpi/values.yaml index 4ae2ffe..6e3c3a8 100644 --- a/charts/rancher-vsphere-cpi/values.yaml +++ b/charts/rancher-vsphere-cpi/values.yaml @@ -2,7 +2,7 @@ vCenter: host: "" port: 443 insecureFlag: true - datacenters: "" + datacenters: [] username: "" password: "" credentialsSecret: From 9d9344595880539a266d3f7c0cc7dad1c7d16896 Mon Sep 17 00:00:00 2001 From: Shawn Warren Date: Tue, 5 Dec 2023 10:15:33 -0600 Subject: [PATCH 3/4] fix: correct range function --- charts/rancher-vsphere-cpi/templates/configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rancher-vsphere-cpi/templates/configmap.yaml b/charts/rancher-vsphere-cpi/templates/configmap.yaml index 19ec4da..d3b1f2f 100644 --- a/charts/rancher-vsphere-cpi/templates/configmap.yaml +++ b/charts/rancher-vsphere-cpi/templates/configmap.yaml @@ -21,8 +21,8 @@ data: vcenter: {{ .host | quote }}: server: {{ .host | quote }} - {{- range $datacenter := .datacenters }} datacenters: + {{- range $datacenter := .datacenters }} - {{ $datacenter | quote }} {{- end }} {{- if .labels.generate }} From f2dd040bf6be96328ff3210e305a0eb1c9b4fa10 Mon Sep 17 00:00:00 2001 From: Shawn Warren Date: Tue, 5 Dec 2023 10:17:20 -0600 Subject: [PATCH 4/4] chore: bump chart ver --- charts/rancher-vsphere-cpi/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rancher-vsphere-cpi/Chart.yaml b/charts/rancher-vsphere-cpi/Chart.yaml index 3582a5d..394dced 100644 --- a/charts/rancher-vsphere-cpi/Chart.yaml +++ b/charts/rancher-vsphere-cpi/Chart.yaml @@ -23,4 +23,4 @@ maintainers: name: rancher-vsphere-cpi sources: - https://github.com/kubernetes/cloud-provider-vsphere -version: 1.6.0 +version: 1.7.0