csi: remove cluster-id from config to let csi generate an id instead …

…of hitting length limits
kubernetes-sigs · Feb 6, 2024 · d0bb2b2 · d0bb2b2
1 parent 73b3e90
commit d0bb2b2
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 7 deletions.
diff --git a/packaging/flavorgen/flavors/crs/csi.go b/packaging/flavorgen/flavors/crs/csi.go
@@ -17,7 +17,6 @@ limitations under the License.
 package crs
 
 import (
-	"fmt"
 	"path"
 
 	"github.com/pkg/errors"
@@ -101,7 +100,6 @@ func CreateCrsResourceObjectsCSI(crs *addonsv1.ClusterResourceSet) ([]runtime.Ob
 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
 

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

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

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

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

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