fix

kubernetes-sigs · Jul 23, 2024 · 2c15fac · 2c15fac
1 parent e6b8ed4
commit 2c15fac
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/packaging/flavorgen/flavors/crs/cpi.go b/packaging/flavorgen/flavors/crs/cpi.go
@@ -19,6 +19,7 @@ package crs
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/pkg/errors"
 	appsv1 "k8s.io/api/apps/v1"
@@ -108,6 +109,8 @@ func CreateCrsResourceObjectsCPI(crs *addonsv1.ClusterResourceSet) []runtime.Obj
 	cpiObjects = append(cpiObjects, cpiDaemonSet)
 
 	manifestsCm := newConfigMapManifests("cpi-manifests", cpiObjects)
+	// Ensure the VSPHERE_INSECURE_CPI variable is in-between ticks.
+	manifestsCm.Data["data"] = strings.ReplaceAll(manifestsCm.Data["data"], "${VSPHERE_INSECURE_CPI:=false}", "\"${VSPHERE_INSECURE_CPI:=false}\"")
 	appendConfigMapToCrsResource(crs, manifestsCm)
 	// Define the kubeconfig secret for the target cluster.
 

diff --git a/templates/cluster-template-external-loadbalancer.yaml b/templates/cluster-template-external-loadbalancer.yaml
@@ -1329,7 +1329,7 @@ data:
             - --cloud-config=/etc/cloud/vsphere.conf
             env:
             - name: VSPHERE_INSECURE
-              value: ${VSPHERE_INSECURE_CPI:=false}
+              value: "${VSPHERE_INSECURE_CPI:=false}"
             image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
             name: vsphere-cloud-controller-manager
             resources:

diff --git a/templates/cluster-template-ignition.yaml b/templates/cluster-template-ignition.yaml
@@ -1533,7 +1533,7 @@ data:
             - --cloud-config=/etc/cloud/vsphere.conf
             env:
             - name: VSPHERE_INSECURE
-              value: ${VSPHERE_INSECURE_CPI:=false}
+              value: "${VSPHERE_INSECURE_CPI:=false}"
             image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
             name: vsphere-cloud-controller-manager
             resources:

diff --git a/templates/cluster-template-node-ipam.yaml b/templates/cluster-template-node-ipam.yaml
@@ -1454,7 +1454,7 @@ data:
             - --cloud-config=/etc/cloud/vsphere.conf
             env:
             - name: VSPHERE_INSECURE
-              value: ${VSPHERE_INSECURE_CPI:=false}
+              value: "${VSPHERE_INSECURE_CPI:=false}"
             image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
             name: vsphere-cloud-controller-manager
             resources:

diff --git a/templates/cluster-template-topology.yaml b/templates/cluster-template-topology.yaml
@@ -1228,7 +1228,7 @@ data:
             - --cloud-config=/etc/cloud/vsphere.conf
             env:
             - name: VSPHERE_INSECURE
-              value: ${VSPHERE_INSECURE_CPI:=false}
+              value: "${VSPHERE_INSECURE_CPI:=false}"
             image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
             name: vsphere-cloud-controller-manager
             resources:

diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -1444,7 +1444,7 @@ data:
             - --cloud-config=/etc/cloud/vsphere.conf
             env:
             - name: VSPHERE_INSECURE
-              value: ${VSPHERE_INSECURE_CPI:=false}
+              value: "${VSPHERE_INSECURE_CPI:=false}"
             image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
             name: vsphere-cloud-controller-manager
             resources: