From d0bb2b2f25db92856bde7e983c5ccbd7d8e8299b Mon Sep 17 00:00:00 2001
From: Christian Schlotter <schlotterc@vmware.com>
Date: Tue, 6 Feb 2024 12:55:34 +0100
Subject: [PATCH] csi: remove cluster-id from config to let csi generate an id
 instead of hitting length limits

---
 packaging/flavorgen/flavors/crs/csi.go                | 2 --
 templates/cluster-template-external-loadbalancer.yaml | 1 -
 templates/cluster-template-ignition.yaml              | 1 -
 templates/cluster-template-node-ipam.yaml             | 1 -
 templates/cluster-template-topology.yaml              | 1 -
 templates/cluster-template.yaml                       | 1 -
 6 files changed, 7 deletions(-)

diff --git a/packaging/flavorgen/flavors/crs/csi.go b/packaging/flavorgen/flavors/crs/csi.go
index ed9711c630..65ff1ce986 100644
--- 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
index 7c3e514e2d..2d046c4fbe 100644
--- 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
index 8828e07748..1eba549cb0 100644
--- 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
index 948b1711f8..225fa3766c 100644
--- 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
index bc9d367a0c..2cc7381762 100644
--- 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
index b4ea11b137..4e5b4536a4 100644
--- 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}"