flavorgen: enforce VSPHERE_USERNAME and VSPHERE_PASSWORD variables to…

… be set as string in templates
kubernetes-sigs · Jun 3, 2024 · 7ecaf89 · 7ecaf89
1 parent 6e8e237
commit 7ecaf89
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 29 deletions.
diff --git a/packaging/flavorgen/flavors/util/helpers.go b/packaging/flavorgen/flavors/util/helpers.go
@@ -85,8 +85,9 @@ var (
 		regexVar(env.VSphereServerVar),
 		regexVar(env.VSphereTemplateVar),
 		regexVar(env.VSphereStoragePolicyVar),
-		// TODO: Why was thumbprint not here?
 		regexVar(env.VSphereThumbprint),
+		regexVar(env.VSphereUsername),
+		regexVar(env.VSpherePassword),
 	}
 )
 

diff --git a/templates/cluster-template-external-loadbalancer.yaml b/templates/cluster-template-external-loadbalancer.yaml
@@ -222,8 +222,8 @@ metadata:
   name: '${CLUSTER_NAME}'
   namespace: '${NAMESPACE}'
 stringData:
-  password: ${VSPHERE_PASSWORD}
-  username: ${VSPHERE_USERNAME}
+  password: '${VSPHERE_PASSWORD}'
+  username: '${VSPHERE_USERNAME}'
 ---
 apiVersion: v1
 kind: Secret
@@ -1124,8 +1124,8 @@ stringData:
       name: cloud-provider-vsphere-credentials
       namespace: kube-system
     stringData:
-      ${VSPHERE_SERVER}.password: ${VSPHERE_PASSWORD}
-      ${VSPHERE_SERVER}.username: ${VSPHERE_USERNAME}
+      ${VSPHERE_SERVER}.password: '${VSPHERE_PASSWORD}'
+      ${VSPHERE_SERVER}.username: '${VSPHERE_USERNAME}'
     type: Opaque
 type: addons.cluster.x-k8s.io/resource-set
 ---

diff --git a/templates/cluster-template-ignition.yaml b/templates/cluster-template-ignition.yaml
@@ -436,8 +436,8 @@ metadata:
   name: '${CLUSTER_NAME}'
   namespace: '${NAMESPACE}'
 stringData:
-  password: ${VSPHERE_PASSWORD}
-  username: ${VSPHERE_USERNAME}
+  password: '${VSPHERE_PASSWORD}'
+  username: '${VSPHERE_USERNAME}'
 ---
 apiVersion: v1
 kind: Secret
@@ -1338,8 +1338,8 @@ stringData:
       name: cloud-provider-vsphere-credentials
       namespace: kube-system
     stringData:
-      ${VSPHERE_SERVER}.password: ${VSPHERE_PASSWORD}
-      ${VSPHERE_SERVER}.username: ${VSPHERE_USERNAME}
+      ${VSPHERE_SERVER}.password: '${VSPHERE_PASSWORD}'
+      ${VSPHERE_SERVER}.username: '${VSPHERE_USERNAME}'
     type: Opaque
 type: addons.cluster.x-k8s.io/resource-set
 ---

diff --git a/templates/cluster-template-node-ipam.yaml b/templates/cluster-template-node-ipam.yaml
@@ -357,8 +357,8 @@ metadata:
   name: '${CLUSTER_NAME}'
   namespace: '${NAMESPACE}'
 stringData:
-  password: ${VSPHERE_PASSWORD}
-  username: ${VSPHERE_USERNAME}
+  password: '${VSPHERE_PASSWORD}'
+  username: '${VSPHERE_USERNAME}'
 ---
 apiVersion: v1
 kind: Secret
@@ -1259,8 +1259,8 @@ stringData:
       name: cloud-provider-vsphere-credentials
       namespace: kube-system
     stringData:
-      ${VSPHERE_SERVER}.password: ${VSPHERE_PASSWORD}
-      ${VSPHERE_SERVER}.username: ${VSPHERE_USERNAME}
+      ${VSPHERE_SERVER}.password: '${VSPHERE_PASSWORD}'
+      ${VSPHERE_SERVER}.username: '${VSPHERE_USERNAME}'
     type: Opaque
 type: addons.cluster.x-k8s.io/resource-set
 ---

diff --git a/templates/cluster-template-supervisor.yaml b/templates/cluster-template-supervisor.yaml
@@ -316,8 +316,8 @@ metadata:
   name: '${CLUSTER_NAME}'
   namespace: '${NAMESPACE}'
 stringData:
-  password: ${VSPHERE_PASSWORD}
-  username: ${VSPHERE_USERNAME}
+  password: '${VSPHERE_PASSWORD}'
+  username: '${VSPHERE_USERNAME}'
 ---
 apiVersion: v1
 kind: Secret
@@ -1218,8 +1218,8 @@ stringData:
       name: cloud-provider-vsphere-credentials
       namespace: kube-system
     stringData:
-      ${VSPHERE_SERVER}.password: ${VSPHERE_PASSWORD}
-      ${VSPHERE_SERVER}.username: ${VSPHERE_USERNAME}
+      ${VSPHERE_SERVER}.password: '${VSPHERE_PASSWORD}'
+      ${VSPHERE_SERVER}.username: '${VSPHERE_USERNAME}'
     type: Opaque
 type: addons.cluster.x-k8s.io/resource-set
 ---

diff --git a/templates/cluster-template-topology-supervisor.yaml b/templates/cluster-template-topology-supervisor.yaml
@@ -103,8 +103,8 @@ metadata:
   name: '${CLUSTER_NAME}'
   namespace: '${NAMESPACE}'
 stringData:
-  password: ${VSPHERE_PASSWORD}
-  username: ${VSPHERE_USERNAME}
+  password: '${VSPHERE_PASSWORD}'
+  username: '${VSPHERE_USERNAME}'
 ---
 apiVersion: addons.cluster.x-k8s.io/v1beta1
 kind: ClusterResourceSet
@@ -1026,8 +1026,8 @@ stringData:
       name: cloud-provider-vsphere-credentials
       namespace: kube-system
     stringData:
-      ${VSPHERE_SERVER}.password: ${VSPHERE_PASSWORD}
-      ${VSPHERE_SERVER}.username: ${VSPHERE_USERNAME}
+      ${VSPHERE_SERVER}.password: '${VSPHERE_PASSWORD}'
+      ${VSPHERE_SERVER}.username: '${VSPHERE_USERNAME}'
     type: Opaque
 type: addons.cluster.x-k8s.io/resource-set
 ---

diff --git a/templates/cluster-template-topology.yaml b/templates/cluster-template-topology.yaml
@@ -109,8 +109,8 @@ metadata:
   name: '${CLUSTER_NAME}'
   namespace: '${NAMESPACE}'
 stringData:
-  password: ${VSPHERE_PASSWORD}
-  username: ${VSPHERE_USERNAME}
+  password: '${VSPHERE_PASSWORD}'
+  username: '${VSPHERE_USERNAME}'
 ---
 apiVersion: addons.cluster.x-k8s.io/v1beta1
 kind: ClusterResourceSet
@@ -1032,8 +1032,8 @@ stringData:
       name: cloud-provider-vsphere-credentials
       namespace: kube-system
     stringData:
-      ${VSPHERE_SERVER}.password: ${VSPHERE_PASSWORD}
-      ${VSPHERE_SERVER}.username: ${VSPHERE_USERNAME}
+      ${VSPHERE_SERVER}.password: '${VSPHERE_PASSWORD}'
+      ${VSPHERE_SERVER}.username: '${VSPHERE_USERNAME}'
     type: Opaque
 type: addons.cluster.x-k8s.io/resource-set
 ---

diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -347,8 +347,8 @@ metadata:
   name: '${CLUSTER_NAME}'
   namespace: '${NAMESPACE}'
 stringData:
-  password: ${VSPHERE_PASSWORD}
-  username: ${VSPHERE_USERNAME}
+  password: '${VSPHERE_PASSWORD}'
+  username: '${VSPHERE_USERNAME}'
 ---
 apiVersion: v1
 kind: Secret
@@ -1249,8 +1249,8 @@ stringData:
       name: cloud-provider-vsphere-credentials
       namespace: kube-system
     stringData:
-      ${VSPHERE_SERVER}.password: ${VSPHERE_PASSWORD}
-      ${VSPHERE_SERVER}.username: ${VSPHERE_USERNAME}
+      ${VSPHERE_SERVER}.password: '${VSPHERE_PASSWORD}'
+      ${VSPHERE_SERVER}.username: '${VSPHERE_USERNAME}'
     type: Opaque
 type: addons.cluster.x-k8s.io/resource-set
 ---