Remove FSS block-volume-snapshot

johnchobroadcom · johnchobroadcom · commit 4a26d23c999d · 2025-07-29T10:25:15.000-07:00
diff --git a/manifests/guestcluster/1.33/pvcsi.yaml b/manifests/guestcluster/1.33/pvcsi.yaml
@@ -664,7 +664,6 @@ data:
   "online-volume-extend": "true"
   "file-volume": "true"
   "csi-sv-feature-states-replication": "false" # Do not enable for guest cluster, Refer PR#2386 for details
-  "block-volume-snapshot": "true"
   "tkgs-ha": "true"
   "cnsmgr-suspend-create-volume": "true"
   "csi-windows-support": "true"
diff --git a/manifests/supervisorcluster/1.32/cns-csi.yaml b/manifests/supervisorcluster/1.32/cns-csi.yaml
@@ -556,7 +556,6 @@ data:
   "csi-sv-feature-states-replication": "true"
   "fake-attach": "true"
   "improved-csi-idempotency": "true"
-  "block-volume-snapshot": "true"
   "tkgs-ha": "true"
   "list-volumes": "true"
   "cnsmgr-suspend-create-volume": "true"
diff --git a/pkg/common/unittestcommon/utils.go b/pkg/common/unittestcommon/utils.go
@@ -62,7 +62,6 @@ func GetFakeContainerOrchestratorInterface(orchestratorType int) (commonco.COCom
 				"volume-health":                     "true",
 				"csi-migration":                     "true",
 				"file-volume":                       "true",
-				"block-volume-snapshot":             "true",
 				"tkgs-ha":                           "true",
 				"list-volumes":                      "true",
 				"csi-internal-generated-cluster-id": "true",
diff --git a/pkg/csi/service/common/commonco/k8sorchestrator/k8sorchestrator.go b/pkg/csi/service/common/commonco/k8sorchestrator/k8sorchestrator.go
@@ -359,7 +359,6 @@ func getReleasedVanillaFSS() map[string]struct{} {
 	return map[string]struct{}{
 		common.CSIMigration:                   {},
 		common.OnlineVolumeExtend:             {},
-		common.BlockVolumeSnapshot:            {},
 		common.CSIWindowsSupport:              {},
 		common.ListVolumes:                    {},
 		common.CnsMgrSuspendCreateVolume:      {},
diff --git a/pkg/csi/service/common/constants.go b/pkg/csi/service/common/constants.go
@@ -396,9 +396,6 @@ const (
 	// CSIVolumeManagerIdempotency is the feature flag for idempotency handling
 	// in CSI volume manager.
 	CSIVolumeManagerIdempotency = "improved-csi-idempotency"
-	// BlockVolumeSnapshot is the feature to support CSI Snapshots for block
-	// volume on vSphere CSI driver.
-	BlockVolumeSnapshot = "block-volume-snapshot"
 	// CSIWindowsSupport is the feature to support csi block volumes for windows
 	// node.
 	CSIWindowsSupport = "csi-windows-support"
diff --git a/pkg/csi/service/vanilla/controller.go b/pkg/csi/service/vanilla/controller.go
@@ -120,10 +120,7 @@ func (c *controller) Init(config *cnsconfig.Config, version string) error {
 	var err error
 	var operationStore cnsvolumeoperationrequest.VolumeOperationRequest
 	operationStore, err = cnsvolumeoperationrequest.InitVolumeOperationRequestInterface(ctx,
-		config.Global.CnsVolumeOperationRequestCleanupIntervalInMin,
-		func() bool {
-			return commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
-		}, false)
+		config.Global.CnsVolumeOperationRequestCleanupIntervalInMin, false)
 	if err != nil {
 		log.Errorf("failed to initialize VolumeOperationRequestInterface with error: %v", err)
 		return err
@@ -523,13 +520,12 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
 	volSizeMB := int64(common.RoundUpSize(volSizeBytes, common.MbInBytes))
 
 	// Check if the feature states are enabled.
-	isBlockVolumeSnapshotEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
 	csiMigrationFeatureState := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CSIMigration)
 
 	// Check if requested volume size and source snapshot size matches
 	volumeSource := req.GetVolumeContentSource()
 	var contentSourceSnapshotID string
-	if isBlockVolumeSnapshotEnabled && volumeSource != nil {
+	if volumeSource != nil {
 		isCnsSnapshotSupported, err := c.manager.VcenterManager.IsCnsSnapshotSupported(ctx,
 			c.manager.VcenterConfig.Host)
 		if err != nil {
@@ -2173,8 +2169,7 @@ func (c *controller) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequ
 			volumeType = convertCnsVolumeType(ctx, cnsVolumeType)
 		}
 		// Check if the volume contains CNS snapshots only for block volumes.
-		if cnsVolumeType == common.BlockVolumeType &&
-			commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot) {
+		if cnsVolumeType == common.BlockVolumeType {
 			isCnsSnapshotSupported, err := vCenterManager.IsCnsSnapshotSupported(ctx, vCenterHost)
 			if err != nil {
 				return nil, csifault.CSIInternalFault, logger.LogNewErrorCodef(log, codes.Internal,
@@ -2588,28 +2583,27 @@ func (c *controller) ControllerExpandVolume(ctx context.Context, req *csi.Contro
 		volumeID := req.GetVolumeId()
 		volSizeBytes := int64(req.GetCapacityRange().GetRequiredBytes())
 		volSizeMB := int64(common.RoundUpSize(volSizeBytes, common.MbInBytes))
+
 		// Check if the volume contains CNS snapshots.
-		if commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot) {
-			isCnsSnapshotSupported, err := vCenterManager.IsCnsSnapshotSupported(ctx, vCenterHost)
+		isCnsSnapshotSupported, err := vCenterManager.IsCnsSnapshotSupported(ctx, vCenterHost)
+		if err != nil {
+			return nil, csifault.CSIInternalFault, logger.LogNewErrorCodef(log, codes.Internal,
+				"failed to check if cns snapshot is supported on VC due to error: %v", err)
+		}
+		if isCnsSnapshotSupported {
+			snapshots, _, err := common.QueryVolumeSnapshotsByVolumeID(ctx, volumeManager, volumeID,
+				common.QuerySnapshotLimit)
 			if err != nil {
 				return nil, csifault.CSIInternalFault, logger.LogNewErrorCodef(log, codes.Internal,
-					"failed to check if cns snapshot is supported on VC due to error: %v", err)
+					"failed to retrieve snapshots for volume: %s. Error: %+v", volumeID, err)
 			}
-			if isCnsSnapshotSupported {
-				snapshots, _, err := common.QueryVolumeSnapshotsByVolumeID(ctx, volumeManager, volumeID,
-					common.QuerySnapshotLimit)
-				if err != nil {
-					return nil, csifault.CSIInternalFault, logger.LogNewErrorCodef(log, codes.Internal,
-						"failed to retrieve snapshots for volume: %s. Error: %+v", volumeID, err)
-				}
-				if len(snapshots) == 0 {
-					log.Infof("The volume %s can be safely expanded as no CNS snapshots were found.",
-						req.VolumeId)
-				} else {
-					return nil, csifault.CSIInvalidArgumentFault, logger.LogNewErrorCodef(log, codes.FailedPrecondition,
-						"volume: %s with existing snapshots %v cannot be expanded. "+
-							"Please delete snapshots before expanding the volume", req.VolumeId, snapshots)
-				}
+			if len(snapshots) == 0 {
+				log.Infof("The volume %s can be safely expanded as no CNS snapshots were found.",
+					req.VolumeId)
+			} else {
+				return nil, csifault.CSIInvalidArgumentFault, logger.LogNewErrorCodef(log, codes.FailedPrecondition,
+					"volume: %s with existing snapshots %v cannot be expanded. "+
+						"Please delete snapshots before expanding the volume", req.VolumeId, snapshots)
 			}
 		}
 
@@ -3015,11 +3009,6 @@ func (c *controller) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshot
 	)
 	log.Infof("CreateSnapshot: called with args %+v", *req)
 
-	isBlockVolumeSnapshotEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
-	if !isBlockVolumeSnapshotEnabled {
-		return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "createSnapshot")
-	}
-
 	volumeID := req.GetSourceVolumeId()
 	// Fetch vCenterHost, vCenterManager & volumeManager for given snapshot, based on VC configuration
 	vCenterManager = getVCenterManagerForVCenter(ctx, c)
@@ -3186,12 +3175,6 @@ func (c *controller) DeleteSnapshot(ctx context.Context, req *csi.DeleteSnapshot
 	)
 	log.Infof("DeleteSnapshot: called with args %+v", *req)
 
-	isBlockVolumeSnapshotEnabled :=
-		commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
-	if !isBlockVolumeSnapshotEnabled {
-		return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "deleteSnapshot")
-	}
-
 	volumeID, _, err := common.ParseCSISnapshotID(req.SnapshotId)
 	if err != nil {
 		return nil, logger.LogNewErrorCode(log, codes.InvalidArgument, err.Error())
diff --git a/pkg/csi/service/wcp/controller.go b/pkg/csi/service/wcp/controller.go
@@ -156,9 +156,7 @@ func (c *controller) Init(config *cnsconfig.Config, version string) error {
 		log.Info("CSI Volume manager idempotency handling feature flag is enabled.")
 		operationStore, err = cnsvolumeoperationrequest.InitVolumeOperationRequestInterface(ctx,
 			config.Global.CnsVolumeOperationRequestCleanupIntervalInMin,
-			func() bool {
-				return commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
-			}, isPodVMOnStretchSupervisorFSSEnabled)
+			isPodVMOnStretchSupervisorFSSEnabled)
 		if err != nil {
 			log.Errorf("failed to initialize VolumeOperationRequestInterface with error: %v", err)
 			return err
@@ -388,9 +386,7 @@ func (c *controller) ReloadConfiguration(reconnectToVCFromNewConfig bool) error
 			log.Info("CSI Volume manager idempotency handling feature flag is enabled.")
 			operationStore, err = cnsvolumeoperationrequest.InitVolumeOperationRequestInterface(ctx,
 				c.manager.CnsConfig.Global.CnsVolumeOperationRequestCleanupIntervalInMin,
-				func() bool {
-					return commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
-				}, isPodVMOnStretchSupervisorFSSEnabled)
+				isPodVMOnStretchSupervisorFSSEnabled)
 			if err != nil {
 				log.Errorf("failed to initialize VolumeOperationRequestInterface with error: %v", err)
 				return err
@@ -721,11 +717,10 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
 		volSizeBytes = int64(req.GetCapacityRange().GetRequiredBytes())
 	}
 	volSizeMB := int64(common.RoundUpSize(volSizeBytes, common.MbInBytes))
-	isBlockVolumeSnapshotEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
 	// Check if requested volume size and source snapshot size matches
 	volumeSource := req.GetVolumeContentSource()
 	var contentSourceSnapshotID string
-	if isBlockVolumeSnapshotEnabled && volumeSource != nil {
+	if volumeSource != nil {
 		sourceSnapshot := volumeSource.GetSnapshot()
 		if sourceSnapshot == nil {
 			return nil, csifault.CSIInvalidArgumentFault,
@@ -1688,8 +1683,7 @@ func (c *controller) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequ
 			volumeType = convertCnsVolumeType(ctx, cnsVolumeType)
 		}
 		// Check if the volume contains CNS snapshots only for block volumes.
-		if cnsVolumeType == common.BlockVolumeType &&
-			commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot) {
+		if cnsVolumeType == common.BlockVolumeType {
 			snapshots, _, err := common.QueryVolumeSnapshotsByVolumeID(ctx, c.manager.VolumeManager, req.VolumeId,
 				common.QuerySnapshotLimit)
 			if err != nil {
@@ -2373,10 +2367,6 @@ func (c *controller) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshot
 	ctx = logger.NewContextWithLogger(ctx)
 	log := logger.GetLogger(ctx)
 	log.Infof("WCP CreateSnapshot: called with args %+v", *req)
-	isBlockVolumeSnapshotWCPEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
-	if !isBlockVolumeSnapshotWCPEnabled {
-		return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "createSnapshot")
-	}
 	volumeType := prometheus.PrometheusUnknownVolumeType
 	createSnapshotInternal := func() (*csi.CreateSnapshotResponse, error) {
 		// Validate CreateSnapshotRequest
@@ -2517,10 +2507,6 @@ func (c *controller) DeleteSnapshot(ctx context.Context, req *csi.DeleteSnapshot
 	log.Infof("DeleteSnapshot: called with args %+v", *req)
 	volumeType := prometheus.PrometheusBlockVolumeType
 	start := time.Now()
-	isBlockVolumeSnapshotWCPEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
-	if !isBlockVolumeSnapshotWCPEnabled {
-		return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "deleteSnapshot")
-	}
 	deleteSnapshotInternal := func() (*csi.DeleteSnapshotResponse, error) {
 		csiSnapshotID := req.GetSnapshotId()
 		isStorageQuotaM2FSSEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx,
@@ -2593,10 +2579,6 @@ func (c *controller) ListSnapshots(ctx context.Context, req *csi.ListSnapshotsRe
 	log := logger.GetLogger(ctx)
 	volumeType := prometheus.PrometheusBlockVolumeType
 	log.Infof("ListSnapshots: called with args %+v", *req)
-	isBlockVolumeSnapshotWCPEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
-	if !isBlockVolumeSnapshotWCPEnabled {
-		return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "listSnapshot")
-	}
 	listSnapshotsInternal := func() (*csi.ListSnapshotsResponse, error) {
 		err := validateWCPListSnapshotRequest(ctx, req)
 		if err != nil {
@@ -2664,8 +2646,7 @@ func (c *controller) ControllerExpandVolume(ctx context.Context, req *csi.Contro
 			}
 			volumeType = convertCnsVolumeType(ctx, cnsVolumeType)
 		}
-		if cnsVolumeType == common.BlockVolumeType &&
-			commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot) {
+		if cnsVolumeType == common.BlockVolumeType {
 			snapshots, _, err := common.QueryVolumeSnapshotsByVolumeID(ctx, c.manager.VolumeManager, req.VolumeId,
 				common.QuerySnapshotLimit)
 			if err != nil {
diff --git a/pkg/csi/service/wcpguest/controller.go b/pkg/csi/service/wcpguest/controller.go
@@ -327,8 +327,7 @@ func (c *controller) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequ
 		}
 		volSizeMB := int64(common.RoundUpSize(volSizeBytes, common.MbInBytes))
 		volumeSource := req.GetVolumeContentSource()
-		if commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot) &&
-			volumeSource != nil {
+		if volumeSource != nil {
 			sourceSnapshot := volumeSource.GetSnapshot()
 			if sourceSnapshot == nil {
 				return nil, csifault.CSIInvalidArgumentFault,
@@ -493,8 +492,7 @@ func (c *controller) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequ
 		}
 
 		// Set the Snapshot VolumeContentSource in the CreateVolumeResponse
-		if commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot) &&
-			volumeSnapshotName != "" {
+		if volumeSnapshotName != "" {
 			resp.Volume.ContentSource = &csi.VolumeContentSource{
 				Type: &csi.VolumeContentSource_Snapshot{
 					Snapshot: &csi.VolumeContentSource_SnapshotSource{
@@ -1603,11 +1601,6 @@ func (c *controller) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshot
 	start := time.Now()
 	volumeType := prometheus.PrometheusBlockVolumeType
 	log.Infof("CreateSnapshot: called with args %+v", *req)
-	isBlockVolumeSnapshotWCPEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx,
-		common.BlockVolumeSnapshot)
-	if !isBlockVolumeSnapshotWCPEnabled {
-		return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "createSnapshot")
-	}
 	createSnapshotInternal := func() (*csi.CreateSnapshotResponse, error) {
 		// Search for supervisor PVC and ensure it exists
 		supervisorPVCName := req.SourceVolumeId
@@ -1735,10 +1728,6 @@ func (c *controller) DeleteSnapshot(ctx context.Context, req *csi.DeleteSnapshot
 	start := time.Now()
 	volumeType := prometheus.PrometheusBlockVolumeType
 	log.Infof("DeleteSnapshot: called with args %+v", *req)
-	isBlockVolumeSnapshotWCPEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
-	if !isBlockVolumeSnapshotWCPEnabled {
-		return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "deleteSnapshot")
-	}
 	deleteSnapshotInternal := func() (*csi.DeleteSnapshotResponse, error) {
 		csiSnapshotID := req.GetSnapshotId()
 		// Retrieve the supervisor volumesnapshot
@@ -1828,10 +1817,6 @@ func (c *controller) ListSnapshots(ctx context.Context, req *csi.ListSnapshotsRe
 	start := time.Now()
 	volumeType := prometheus.PrometheusBlockVolumeType
 	log.Infof("ListSnapshots: called with args %+v", *req)
-	isBlockVolumeSnapshotEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
-	if !isBlockVolumeSnapshotEnabled {
-		return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "listSnapshot")
-	}
 	listSnapshotsInternal := func() (*csi.ListSnapshotsResponse, error) {
 		log.Infof("ListSnapshots: called with args %+v", *req)
 		maxEntries := common.QuerySnapshotLimit
diff --git a/pkg/internalapis/cnsvolumeoperationrequest/cnsvolumeoperationrequest.go b/pkg/internalapis/cnsvolumeoperationrequest/cnsvolumeoperationrequest.go
@@ -85,7 +85,7 @@ var (
 // VolumeOperationRequest interface. Clients are unaware of the implementation
 // details to read and persist volume operation details.
 func InitVolumeOperationRequestInterface(ctx context.Context, cleanupInterval int,
-	isBlockVolumeSnapshotEnabled func() bool, isPodVMOnStretchSupervisorEnabled bool) (
+	isPodVMOnStretchSupervisorEnabled bool) (
 	VolumeOperationRequest, error) {
 	log := logger.GetLogger(ctx)
 	csiNamespace = getCSINamespace()
diff --git a/pkg/syncer/admissionhandler/admissionhandler.go b/pkg/syncer/admissionhandler/admissionhandler.go
@@ -56,7 +56,6 @@ var (
 	// CO agnostic orchestrator in the admission handler package.
 	COInitParams                              *interface{}
 	featureGateCsiMigrationEnabled            bool
-	featureGateBlockVolumeSnapshotEnabled     bool
 	featureGateTKGSHaEnabled                  bool
 	featureGateVolumeHealthEnabled            bool
 	featureGateTopologyAwareFileVolumeEnabled bool
@@ -147,7 +146,6 @@ func StartWebhookServer(ctx context.Context, enableWebhookClientCertVerification
 	if clusterFlavor == cnstypes.CnsClusterFlavorWorkload {
 		featureGateTKGSHaEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx, common.TKGsHA)
 		featureGateVolumeHealthEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx, common.VolumeHealth)
-		featureGateBlockVolumeSnapshotEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
 		featureGateByokEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx, common.WCP_VMService_BYOK)
 		featureIsSharedDiskEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx, common.SharedDiskFss)
 		featureFileVolumesWithVmServiceEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx,
@@ -160,7 +158,6 @@ func StartWebhookServer(ctx context.Context, enableWebhookClientCertVerification
 		}
 	} else if clusterFlavor == cnstypes.CnsClusterFlavorGuest {
 		featureIsLinkedCloneSupportEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx, common.LinkedCloneSupport)
-		featureGateBlockVolumeSnapshotEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
 		startPVCSIWebhookManager(ctx)
 	} else if clusterFlavor == cnstypes.CnsClusterFlavorVanilla {
 		if cfg == nil {
@@ -172,13 +169,12 @@ func StartWebhookServer(ctx context.Context, enableWebhookClientCertVerification
 			log.Debugf("webhook config: %v", cfg)
 		}
 		featureGateCsiMigrationEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx, common.CSIMigration)
-		featureGateBlockVolumeSnapshotEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
 		featureGateTopologyAwareFileVolumeEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx,
 			common.TopologyAwareFileVolume)
 		featureFileVolumesWithVmServiceEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx,
 			common.FileVolumesWithVmService)
 
-		if featureGateCsiMigrationEnabled || featureGateBlockVolumeSnapshotEnabled {
+		if featureGateCsiMigrationEnabled {
 			certs, err := tls.LoadX509KeyPair(cfg.WebHookConfig.CertFile, cfg.WebHookConfig.KeyFile)
 			if err != nil {
 				log.Errorf("failed to load key pair. certFile: %q, keyFile: %q err: %v",
diff --git a/pkg/syncer/admissionhandler/cnscsi_admissionhandler.go b/pkg/syncer/admissionhandler/cnscsi_admissionhandler.go
@@ -190,10 +190,8 @@ func (h *CSISupervisorWebhook) Handle(ctx context.Context, req admission.Request
 				return
 			}
 		}
-		if featureGateBlockVolumeSnapshotEnabled {
-			admissionResp := validatePVC(ctx, &req.AdmissionRequest)
-			resp.AdmissionResponse = *admissionResp.DeepCopy()
-		}
+		admissionResp := validatePVC(ctx, &req.AdmissionRequest)
+		resp.AdmissionResponse = *admissionResp.DeepCopy()
 	} else if req.Kind.Kind == "CnsFileAccessConfig" {
 		if featureFileVolumesWithVmServiceEnabled {
 			switch req.Operation {
diff --git a/pkg/syncer/admissionhandler/pvcsi_admissionhandler.go b/pkg/syncer/admissionhandler/pvcsi_admissionhandler.go
@@ -126,10 +126,6 @@ func (h *CSIGuestWebhook) Handle(ctx context.Context, req admission.Request) (re
 
 	resp = admission.Allowed("")
 	if req.Kind.Kind == "PersistentVolumeClaim" {
-		if featureGateBlockVolumeSnapshotEnabled {
-			admissionResp := validatePVC(ctx, &req.AdmissionRequest)
-			resp.AdmissionResponse = *admissionResp.DeepCopy()
-		}
 		// Do additional checks only if the previous checks were successful
 		if resp.Allowed && featureIsLinkedCloneSupportEnabled {
 			admissionResp := validateGuestPVCOperation(ctx, &req.AdmissionRequest)
@@ -152,9 +148,7 @@ func (g *CSIGuestMutationWebhook) Handle(ctx context.Context, req admission.Requ
 	if req.Kind.Kind == "PersistentVolumeClaim" {
 		switch req.Operation {
 		case admissionv1.Create:
-			if featureGateBlockVolumeSnapshotEnabled {
-				return g.mutateNewPVC(ctx, req)
-			}
+			return g.mutateNewPVC(ctx, req)
 		}
 	}
 	return
diff --git a/pkg/syncer/admissionhandler/validatepvc.go b/pkg/syncer/admissionhandler/validatepvc.go
diff --git a/pkg/syncer/admissionhandler/validatepvc_test.go b/pkg/syncer/admissionhandler/validatepvc_test.go
diff --git a/pkg/syncer/admissionhandler/validatesnapshotoperation.go b/pkg/syncer/admissionhandler/validatesnapshotoperation.go
diff --git a/pkg/syncer/admissionhandler/validatesnapshotoperation_test.go b/pkg/syncer/admissionhandler/validatesnapshotoperation_test.go
