Merge pull request #1819 from PatrickLaabs/1162

🐛 CAPV CSI driver isn't passing TLS thumbprint
kubernetes-sigs · Jul 20, 2023 · 901740c · 901740c
2 parents 9f4726b + 32a0e8e
commit 901740c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 0 deletions.
diff --git a/packaging/flavorgen/flavors/crs/csi.go b/packaging/flavorgen/flavors/crs/csi.go
@@ -128,6 +128,7 @@ func ConfigForCSI() *types.CPIConfig {
 	config := &types.CPIConfig{}
 
 	config.Global.ClusterID = fmt.Sprintf("%s/%s", env.NamespaceVar, env.ClusterNameVar)
+	config.Global.Thumbprint = env.VSphereThumbprint
 	config.Network.Name = env.VSphereNetworkVar
 
 	config.VCenter = map[string]types.CPIVCenterConfig{

diff --git a/templates/cluster-template-external-loadbalancer.yaml b/templates/cluster-template-external-loadbalancer.yaml
@@ -390,6 +390,7 @@ stringData:
     stringData:
       csi-vsphere.conf: |+
         [Global]
+        thumbprint = "${VSPHERE_TLS_THUMBPRINT}"
         cluster-id = "${NAMESPACE}/${CLUSTER_NAME}"
 
         [VirtualCenter "${VSPHERE_SERVER}"]

diff --git a/templates/cluster-template-ignition.yaml b/templates/cluster-template-ignition.yaml
@@ -533,6 +533,7 @@ stringData:
     stringData:
       csi-vsphere.conf: |+
         [Global]
+        thumbprint = "${VSPHERE_TLS_THUMBPRINT}"
         cluster-id = "${NAMESPACE}/${CLUSTER_NAME}"
 
         [VirtualCenter "${VSPHERE_SERVER}"]

diff --git a/templates/cluster-template-node-ipam.yaml b/templates/cluster-template-node-ipam.yaml
@@ -456,6 +456,7 @@ stringData:
     stringData:
       csi-vsphere.conf: |+
         [Global]
+        thumbprint = "${VSPHERE_TLS_THUMBPRINT}"
         cluster-id = "${NAMESPACE}/${CLUSTER_NAME}"
 
         [VirtualCenter "${VSPHERE_SERVER}"]

diff --git a/templates/cluster-template-topology.yaml b/templates/cluster-template-topology.yaml
@@ -285,6 +285,7 @@ stringData:
     stringData:
       csi-vsphere.conf: |+
         [Global]
+        thumbprint = "${VSPHERE_TLS_THUMBPRINT}"
         cluster-id = "${NAMESPACE}/${CLUSTER_NAME}"
 
         [VirtualCenter "${VSPHERE_SERVER}"]

diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -446,6 +446,7 @@ stringData:
     stringData:
       csi-vsphere.conf: |+
         [Global]
+        thumbprint = "${VSPHERE_TLS_THUMBPRINT}"
         cluster-id = "${NAMESPACE}/${CLUSTER_NAME}"
 
         [VirtualCenter "${VSPHERE_SERVER}"]