Removed Insecure-Flag changes, keeping Thumbprint passing and added T…

…humbprint passing to node-ipam-template Author: PatrickLaabs <patrick.laabs@me.de>
kubernetes-sigs · Apr 28, 2023 · ed71c08 · ed71c08
1 parent 55b88a2
commit ed71c08
Show file tree

Hide file tree

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

diff --git a/packaging/flavorgen/flavors/env/envsubts_consts.go b/packaging/flavorgen/flavors/env/envsubts_consts.go
@@ -51,5 +51,4 @@ const (
 	VSphereUsername              = "${VSPHERE_USERNAME}"
 	VSpherePassword              = "${VSPHERE_PASSWORD}" /* #nosec */
 	ClusterResourceSetNameSuffix = "-crs-0"
-	VSphereInsecure              = true
 )
diff --git a/templates/cluster-template-external-loadbalancer.yaml b/templates/cluster-template-external-loadbalancer.yaml
@@ -390,7 +390,6 @@ stringData:
     stringData:
       csi-vsphere.conf: |+
         [Global]
-        insecure-flag = true
         thumbprint = "${VSPHERE_TLS_THUMBPRINT}"
         cluster-id = "${NAMESPACE}/${CLUSTER_NAME}"
 

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

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,7 +285,6 @@ stringData:
     stringData:
       csi-vsphere.conf: |+
         [Global]
-        insecure-flag = true
         thumbprint = "${VSPHERE_TLS_THUMBPRINT}"
         cluster-id = "${NAMESPACE}/${CLUSTER_NAME}"
 

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