Remove FSS sibling-replica-bound-pvc-check (#3397)

Author: johnchobroadcom

manifests/supervisorcluster/1.32/cns-csi.yaml

@@ -557,7 +557,6 @@ data:
   "fake-attach": "true"
   "improved-csi-idempotency": "true"
   "block-volume-snapshot": "true"
-  "sibling-replica-bound-pvc-check": "true"
   "tkgs-ha": "true"
   "list-volumes": "true"
   "cnsmgr-suspend-create-volume": "true"

pkg/csi/service/common/constants.go

@@ -399,10 +399,6 @@ const (
 	// BlockVolumeSnapshot is the feature to support CSI Snapshots for block
 	// volume on vSphere CSI driver.
 	BlockVolumeSnapshot = "block-volume-snapshot"
-	// SiblingReplicaBoundPvcCheck is the feature to check whether a PVC of
-	// a given replica can be placed on a node such that it does not have PVCs
-	// of any of its sibling replicas.
-	SiblingReplicaBoundPvcCheck = "sibling-replica-bound-pvc-check"
 	// CSIWindowsSupport is the feature to support csi block volumes for windows
 	// node.
 	CSIWindowsSupport = "csi-windows-support"

pkg/syncer/k8scloudoperator/placement.go

@@ -35,12 +35,8 @@ import (
 	clientconfig "sigs.k8s.io/controller-runtime/pkg/client/config"
 
 	"sigs.k8s.io/vsphere-csi-driver/v3/pkg/apis/storagepool/cns/v1alpha1"
-	cnsconfig "sigs.k8s.io/vsphere-csi-driver/v3/pkg/common/config"
-	"sigs.k8s.io/vsphere-csi-driver/v3/pkg/csi/service/common"
-	"sigs.k8s.io/vsphere-csi-driver/v3/pkg/csi/service/common/commonco"
 	"sigs.k8s.io/vsphere-csi-driver/v3/pkg/csi/service/logger"
 	k8sinternal "sigs.k8s.io/vsphere-csi-driver/v3/pkg/kubernetes"
-	"sigs.k8s.io/vsphere-csi-driver/v3/pkg/syncer/admissionhandler"
 )
 
 var (
@@ -539,40 +535,13 @@ func getAllPvcs(ctx context.Context, client kubernetes.Interface, namespace stri
 	return allPVCsMap, nil
 }
 
-// Check if internal FSS to check for sibling replica bound PVCs is enabled.
-func isSiblingReplicaBoundPvcFSSEnabled(ctx context.Context) bool {
-	log := logger.GetLogger(ctx)
-
-	containerOrchestratorUtility := commonco.ContainerOrchestratorUtility
-	if containerOrchestratorUtility == nil {
-		clusterFlavor, err := cnsconfig.GetClusterFlavor(ctx)
-		if err != nil {
-			log.Debugf("Failed retrieving cluster flavor. Error: %v", err)
-			return false
-		}
-		containerOrchestratorUtility, err = commonco.GetContainerOrchestratorInterface(ctx,
-			common.Kubernetes, clusterFlavor, *admissionhandler.COInitParams)
-		if err != nil {
-			log.Debugf("failed to get k8s interface. err: %v", err)
-			return false
-		}
-	}
-
-	return containerOrchestratorUtility.IsFSSEnabled(ctx, common.SiblingReplicaBoundPvcCheck)
-}
-
 // eliminateNodesWithPvcOfSiblingReplica filters out the nodes that have
 // bound PVCs of sibling replicas. It finds cousin PVCs of currPVC and
 // elimates all nodes which have at least one cousin PVC placed on them.
 func eliminateNodesWithPvcOfSiblingReplica(ctx context.Context, client kubernetes.Interface,
 	currPVC *v1.PersistentVolumeClaim, candidateHosts []string) ([]string, error) {
 	log := logger.GetLogger(ctx)
 
-	if !isSiblingReplicaBoundPvcFSSEnabled(ctx) {
-		log.Infof("FSS to check for sibling replica's PVCs is not enabled.")
-		return candidateHosts, nil
-	}
-
 	// Proceed only if it is a vDPP PVC.
 	pvcLabels := currPVC.GetLabels()
 	appplatformLabelVal, labelOk := pvcLabels[appplatformLabel]