Remove FSS max-pvscsi-targets-per-vm (#3400)

Author: johnchobroadcom

pkg/common/unittestcommon/utils.go

@@ -72,7 +72,6 @@ func GetFakeContainerOrchestratorInterface(orchestratorType int) (commonco.COCom
 				"pv-to-backingdiskobjectid-mapping": "false",
 				"cnsmgr-suspend-create-volume":      "true",
 				"topology-preferential-datastores":  "true",
-				"max-pvscsi-targets-per-vm":         "true",
 				"multi-vcenter-csi-topology":        "true",
 				"listview-tasks":                    "true",
 				"storage-quota-m2":                  "false",

pkg/csi/service/common/commonco/k8sorchestrator/k8sorchestrator.go

@@ -364,7 +364,6 @@ func getReleasedVanillaFSS() map[string]struct{} {
 		common.ListVolumes:                    {},
 		common.CnsMgrSuspendCreateVolume:      {},
 		common.TopologyPreferentialDatastores: {},
-		common.MaxPVSCSITargetsPerVM:          {},
 		common.MultiVCenterCSITopology:        {},
 		common.CSIInternalGeneratedClusterID:  {},
 		common.TopologyAwareFileVolume:        {},

pkg/csi/service/common/constants.go

@@ -418,8 +418,6 @@ const (
 	// TopologyPreferentialDatastores is the feature gate for preferential
 	// datastore deployment in topology aware environments.
 	TopologyPreferentialDatastores = "topology-preferential-datastores"
-	// MaxPVSCSITargetsPerVM enables support for 255 volumes per node vm
-	MaxPVSCSITargetsPerVM = "max-pvscsi-targets-per-vm"
 	// MultiVCenterCSITopology is the feature gate for enabling multi vCenter topology support for vSphere CSI driver.
 	MultiVCenterCSITopology = "multi-vcenter-csi-topology"
 	// CSIInternalGeneratedClusterID enables support to generate unique cluster

pkg/csi/service/node.go

@@ -35,7 +35,6 @@ import (
 )
 
 const (
-	maxAllowedBlockVolumesPerNode = 59
 	// vCenter 8.0 supports attaching max 255 volumes to Node
 	// Previous vSphere releases supports attaching a max of 59 volumes to Node VM.
 	// Deployment YAML file for Node DaemonSet has ENV MAX_VOLUMES_PER_NODE set to 59 for vsphere-csi-node container
@@ -410,12 +409,7 @@ func (driver *vsphereCSIDriver) NodeGetInfo(
 	}
 
 	var maxVolumesPerNode int64
-	var maxAllowedVolumesPerNode int64
-	if commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.MaxPVSCSITargetsPerVM) {
-		maxAllowedVolumesPerNode = maxAllowedBlockVolumesPerNodeInvSphere8
-	} else {
-		maxAllowedVolumesPerNode = maxAllowedBlockVolumesPerNode
-	}
+	var maxAllowedVolumesPerNode int64 = maxAllowedBlockVolumesPerNodeInvSphere8
 	if v := os.Getenv("MAX_VOLUMES_PER_NODE"); v != "" {
 		if value, err := strconv.ParseInt(v, 10, 64); err == nil {
 			if value < 0 {