Skip to content

Commit 2146eb6

Browse files
johnchobroadcomjohnchobroadcom
committed
Remove FSS block-volume-snapshot
1 parent 081b9bc commit 2146eb6

File tree

16 files changed

+34
-325
lines changed

16 files changed

+34
-325
lines changed

‎manifests/guestcluster/1.33/pvcsi.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,6 @@ data:
664664
"online-volume-extend": "true"
665665
"file-volume": "true"
666666
"csi-sv-feature-states-replication": "false" # Do not enable for guest cluster, Refer PR#2386 for details
667-
"block-volume-snapshot": "true"
668667
"tkgs-ha": "true"
669668
"cnsmgr-suspend-create-volume": "true"
670669
"csi-windows-support": "true"

‎manifests/supervisorcluster/1.32/cns-csi.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,6 @@ data:
555555
"fake-attach": "true"
556556
"async-query-volume": "true"
557557
"improved-csi-idempotency": "true"
558-
"block-volume-snapshot": "true"
559558
"sibling-replica-bound-pvc-check": "true"
560559
"tkgs-ha": "true"
561560
"list-volumes": "true"

‎pkg/common/unittestcommon/utils.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ func GetFakeContainerOrchestratorInterface(orchestratorType int) (commonco.COCom
5858
"volume-health": "true",
5959
"csi-migration": "true",
6060
"file-volume": "true",
61-
"block-volume-snapshot": "true",
6261
"tkgs-ha": "true",
6362
"list-volumes": "true",
6463
"csi-internal-generated-cluster-id": "true",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,6 @@ func getReleasedVanillaFSS() map[string]struct{} {
356356
common.CSIMigration: {},
357357
common.OnlineVolumeExtend: {},
358358
common.AsyncQueryVolume: {},
359-
common.BlockVolumeSnapshot: {},
360359
common.CSIWindowsSupport: {},
361360
common.ListVolumes: {},
362361
common.CnsMgrSuspendCreateVolume: {},

‎pkg/csi/service/common/constants.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,9 +381,6 @@ const (
381381
// CSIVolumeManagerIdempotency is the feature flag for idempotency handling
382382
// in CSI volume manager.
383383
CSIVolumeManagerIdempotency = "improved-csi-idempotency"
384-
// BlockVolumeSnapshot is the feature to support CSI Snapshots for block
385-
// volume on vSphere CSI driver.
386-
BlockVolumeSnapshot = "block-volume-snapshot"
387384
// SiblingReplicaBoundPvcCheck is the feature to check whether a PVC of
388385
// a given replica can be placed on a node such that it does not have PVCs
389386
// of any of its sibling replicas.

‎pkg/csi/service/vanilla/controller.go

Lines changed: 20 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,7 @@ func (c *controller) Init(config *cnsconfig.Config, version string) error {
120120
var err error
121121
var operationStore cnsvolumeoperationrequest.VolumeOperationRequest
122122
operationStore, err = cnsvolumeoperationrequest.InitVolumeOperationRequestInterface(ctx,
123-
config.Global.CnsVolumeOperationRequestCleanupIntervalInMin,
124-
func() bool {
125-
return commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
126-
}, false)
123+
config.Global.CnsVolumeOperationRequestCleanupIntervalInMin, false)
127124
if err != nil {
128125
log.Errorf("failed to initialize VolumeOperationRequestInterface with error: %v", err)
129126
return err
@@ -523,13 +520,12 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
523520
volSizeMB := int64(common.RoundUpSize(volSizeBytes, common.MbInBytes))
524521

525522
// Check if the feature states are enabled.
526-
isBlockVolumeSnapshotEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
527523
csiMigrationFeatureState := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CSIMigration)
528524

529525
// Check if requested volume size and source snapshot size matches
530526
volumeSource := req.GetVolumeContentSource()
531527
var contentSourceSnapshotID string
532-
if isBlockVolumeSnapshotEnabled && volumeSource != nil {
528+
if volumeSource != nil {
533529
isCnsSnapshotSupported, err := c.manager.VcenterManager.IsCnsSnapshotSupported(ctx,
534530
c.manager.VcenterConfig.Host)
535531
if err != nil {
@@ -2164,8 +2160,7 @@ func (c *controller) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequ
21642160
volumeType = convertCnsVolumeType(ctx, cnsVolumeType)
21652161
}
21662162
// Check if the volume contains CNS snapshots only for block volumes.
2167-
if cnsVolumeType == common.BlockVolumeType &&
2168-
commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot) {
2163+
if cnsVolumeType == common.BlockVolumeType {
21692164
isCnsSnapshotSupported, err := vCenterManager.IsCnsSnapshotSupported(ctx, vCenterHost)
21702165
if err != nil {
21712166
return nil, csifault.CSIInternalFault, logger.LogNewErrorCodef(log, codes.Internal,
@@ -2579,28 +2574,27 @@ func (c *controller) ControllerExpandVolume(ctx context.Context, req *csi.Contro
25792574
volumeID := req.GetVolumeId()
25802575
volSizeBytes := int64(req.GetCapacityRange().GetRequiredBytes())
25812576
volSizeMB := int64(common.RoundUpSize(volSizeBytes, common.MbInBytes))
2577+
25822578
// Check if the volume contains CNS snapshots.
2583-
if commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot) {
2584-
isCnsSnapshotSupported, err := vCenterManager.IsCnsSnapshotSupported(ctx, vCenterHost)
2579+
isCnsSnapshotSupported, err := vCenterManager.IsCnsSnapshotSupported(ctx, vCenterHost)
2580+
if err != nil {
2581+
return nil, csifault.CSIInternalFault, logger.LogNewErrorCodef(log, codes.Internal,
2582+
"failed to check if cns snapshot is supported on VC due to error: %v", err)
2583+
}
2584+
if isCnsSnapshotSupported {
2585+
snapshots, _, err := common.QueryVolumeSnapshotsByVolumeID(ctx, volumeManager, volumeID,
2586+
common.QuerySnapshotLimit)
25852587
if err != nil {
25862588
return nil, csifault.CSIInternalFault, logger.LogNewErrorCodef(log, codes.Internal,
2587-
"failed to check if cns snapshot is supported on VC due to error: %v", err)
2589+
"failed to retrieve snapshots for volume: %s. Error: %+v", volumeID, err)
25882590
}
2589-
if isCnsSnapshotSupported {
2590-
snapshots, _, err := common.QueryVolumeSnapshotsByVolumeID(ctx, volumeManager, volumeID,
2591-
common.QuerySnapshotLimit)
2592-
if err != nil {
2593-
return nil, csifault.CSIInternalFault, logger.LogNewErrorCodef(log, codes.Internal,
2594-
"failed to retrieve snapshots for volume: %s. Error: %+v", volumeID, err)
2595-
}
2596-
if len(snapshots) == 0 {
2597-
log.Infof("The volume %s can be safely expanded as no CNS snapshots were found.",
2598-
req.VolumeId)
2599-
} else {
2600-
return nil, csifault.CSIInvalidArgumentFault, logger.LogNewErrorCodef(log, codes.FailedPrecondition,
2601-
"volume: %s with existing snapshots %v cannot be expanded. "+
2602-
"Please delete snapshots before expanding the volume", req.VolumeId, snapshots)
2603-
}
2591+
if len(snapshots) == 0 {
2592+
log.Infof("The volume %s can be safely expanded as no CNS snapshots were found.",
2593+
req.VolumeId)
2594+
} else {
2595+
return nil, csifault.CSIInvalidArgumentFault, logger.LogNewErrorCodef(log, codes.FailedPrecondition,
2596+
"volume: %s with existing snapshots %v cannot be expanded. "+
2597+
"Please delete snapshots before expanding the volume", req.VolumeId, snapshots)
26042598
}
26052599
}
26062600

@@ -3006,11 +3000,6 @@ func (c *controller) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshot
30063000
)
30073001
log.Infof("CreateSnapshot: called with args %+v", *req)
30083002

3009-
isBlockVolumeSnapshotEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
3010-
if !isBlockVolumeSnapshotEnabled {
3011-
return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "createSnapshot")
3012-
}
3013-
30143003
volumeID := req.GetSourceVolumeId()
30153004
// Fetch vCenterHost, vCenterManager & volumeManager for given snapshot, based on VC configuration
30163005
vCenterManager = getVCenterManagerForVCenter(ctx, c)
@@ -3167,12 +3156,6 @@ func (c *controller) DeleteSnapshot(ctx context.Context, req *csi.DeleteSnapshot
31673156
)
31683157
log.Infof("DeleteSnapshot: called with args %+v", *req)
31693158

3170-
isBlockVolumeSnapshotEnabled :=
3171-
commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
3172-
if !isBlockVolumeSnapshotEnabled {
3173-
return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "deleteSnapshot")
3174-
}
3175-
31763159
volumeID, _, err := common.ParseCSISnapshotID(req.SnapshotId)
31773160
if err != nil {
31783161
return nil, logger.LogNewErrorCode(log, codes.InvalidArgument, err.Error())

‎pkg/csi/service/wcp/controller.go

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,7 @@ func (c *controller) Init(config *cnsconfig.Config, version string) error {
157157
log.Info("CSI Volume manager idempotency handling feature flag is enabled.")
158158
operationStore, err = cnsvolumeoperationrequest.InitVolumeOperationRequestInterface(ctx,
159159
config.Global.CnsVolumeOperationRequestCleanupIntervalInMin,
160-
func() bool {
161-
return commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
162-
}, isPodVMOnStretchSupervisorFSSEnabled)
160+
isPodVMOnStretchSupervisorFSSEnabled)
163161
if err != nil {
164162
log.Errorf("failed to initialize VolumeOperationRequestInterface with error: %v", err)
165163
return err
@@ -389,9 +387,7 @@ func (c *controller) ReloadConfiguration(reconnectToVCFromNewConfig bool) error
389387
log.Info("CSI Volume manager idempotency handling feature flag is enabled.")
390388
operationStore, err = cnsvolumeoperationrequest.InitVolumeOperationRequestInterface(ctx,
391389
c.manager.CnsConfig.Global.CnsVolumeOperationRequestCleanupIntervalInMin,
392-
func() bool {
393-
return commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
394-
}, isPodVMOnStretchSupervisorFSSEnabled)
390+
isPodVMOnStretchSupervisorFSSEnabled)
395391
if err != nil {
396392
log.Errorf("failed to initialize VolumeOperationRequestInterface with error: %v", err)
397393
return err
@@ -638,11 +634,10 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
638634
volSizeBytes = int64(req.GetCapacityRange().GetRequiredBytes())
639635
}
640636
volSizeMB := int64(common.RoundUpSize(volSizeBytes, common.MbInBytes))
641-
isBlockVolumeSnapshotEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
642637
// Check if requested volume size and source snapshot size matches
643638
volumeSource := req.GetVolumeContentSource()
644639
var contentSourceSnapshotID string
645-
if isBlockVolumeSnapshotEnabled && volumeSource != nil {
640+
if volumeSource != nil {
646641
sourceSnapshot := volumeSource.GetSnapshot()
647642
if sourceSnapshot == nil {
648643
return nil, csifault.CSIInvalidArgumentFault,
@@ -1290,8 +1285,7 @@ func (c *controller) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequ
12901285
volumeType = convertCnsVolumeType(ctx, cnsVolumeType)
12911286
}
12921287
// Check if the volume contains CNS snapshots only for block volumes.
1293-
if cnsVolumeType == common.BlockVolumeType &&
1294-
commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot) {
1288+
if cnsVolumeType == common.BlockVolumeType {
12951289
snapshots, _, err := common.QueryVolumeSnapshotsByVolumeID(ctx, c.manager.VolumeManager, req.VolumeId,
12961290
common.QuerySnapshotLimit)
12971291
if err != nil {
@@ -1960,10 +1954,6 @@ func (c *controller) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshot
19601954
ctx = logger.NewContextWithLogger(ctx)
19611955
log := logger.GetLogger(ctx)
19621956
log.Infof("WCP CreateSnapshot: called with args %+v", *req)
1963-
isBlockVolumeSnapshotWCPEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
1964-
if !isBlockVolumeSnapshotWCPEnabled {
1965-
return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "createSnapshot")
1966-
}
19671957
volumeType := prometheus.PrometheusUnknownVolumeType
19681958
createSnapshotInternal := func() (*csi.CreateSnapshotResponse, error) {
19691959
// Validate CreateSnapshotRequest
@@ -2108,10 +2098,6 @@ func (c *controller) DeleteSnapshot(ctx context.Context, req *csi.DeleteSnapshot
21082098
log.Infof("DeleteSnapshot: called with args %+v", *req)
21092099
volumeType := prometheus.PrometheusBlockVolumeType
21102100
start := time.Now()
2111-
isBlockVolumeSnapshotWCPEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
2112-
if !isBlockVolumeSnapshotWCPEnabled {
2113-
return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "deleteSnapshot")
2114-
}
21152101
deleteSnapshotInternal := func() (*csi.DeleteSnapshotResponse, error) {
21162102
csiSnapshotID := req.GetSnapshotId()
21172103
isStorageQuotaM2FSSEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx,
@@ -2184,10 +2170,6 @@ func (c *controller) ListSnapshots(ctx context.Context, req *csi.ListSnapshotsRe
21842170
log := logger.GetLogger(ctx)
21852171
volumeType := prometheus.PrometheusBlockVolumeType
21862172
log.Infof("ListSnapshots: called with args %+v", *req)
2187-
isBlockVolumeSnapshotWCPEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
2188-
if !isBlockVolumeSnapshotWCPEnabled {
2189-
return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "listSnapshot")
2190-
}
21912173
listSnapshotsInternal := func() (*csi.ListSnapshotsResponse, error) {
21922174
err := validateWCPListSnapshotRequest(ctx, req)
21932175
if err != nil {
@@ -2259,8 +2241,7 @@ func (c *controller) ControllerExpandVolume(ctx context.Context, req *csi.Contro
22592241
}
22602242
volumeType = convertCnsVolumeType(ctx, cnsVolumeType)
22612243
}
2262-
if cnsVolumeType == common.BlockVolumeType &&
2263-
commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot) {
2244+
if cnsVolumeType == common.BlockVolumeType {
22642245
snapshots, _, err := common.QueryVolumeSnapshotsByVolumeID(ctx, c.manager.VolumeManager, req.VolumeId,
22652246
common.QuerySnapshotLimit)
22662247
if err != nil {

‎pkg/csi/service/wcpguest/controller.go

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,7 @@ func (c *controller) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequ
313313
}
314314
volSizeMB := int64(common.RoundUpSize(volSizeBytes, common.MbInBytes))
315315
volumeSource := req.GetVolumeContentSource()
316-
if commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot) &&
317-
volumeSource != nil {
316+
if volumeSource != nil {
318317
sourceSnapshot := volumeSource.GetSnapshot()
319318
if sourceSnapshot == nil {
320319
return nil, csifault.CSIInvalidArgumentFault,
@@ -430,8 +429,7 @@ func (c *controller) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequ
430429
}
431430

432431
// Set the Snapshot VolumeContentSource in the CreateVolumeResponse
433-
if commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot) &&
434-
volumeSnapshotName != "" {
432+
if volumeSnapshotName != "" {
435433
resp.Volume.ContentSource = &csi.VolumeContentSource{
436434
Type: &csi.VolumeContentSource_Snapshot{
437435
Snapshot: &csi.VolumeContentSource_SnapshotSource{
@@ -1546,11 +1544,6 @@ func (c *controller) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshot
15461544
start := time.Now()
15471545
volumeType := prometheus.PrometheusBlockVolumeType
15481546
log.Infof("CreateSnapshot: called with args %+v", *req)
1549-
isBlockVolumeSnapshotWCPEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx,
1550-
common.BlockVolumeSnapshot)
1551-
if !isBlockVolumeSnapshotWCPEnabled {
1552-
return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "createSnapshot")
1553-
}
15541547
createSnapshotInternal := func() (*csi.CreateSnapshotResponse, error) {
15551548
// Search for supervisor PVC and ensure it exists
15561549
supervisorPVCName := req.SourceVolumeId
@@ -1678,10 +1671,6 @@ func (c *controller) DeleteSnapshot(ctx context.Context, req *csi.DeleteSnapshot
16781671
start := time.Now()
16791672
volumeType := prometheus.PrometheusBlockVolumeType
16801673
log.Infof("DeleteSnapshot: called with args %+v", *req)
1681-
isBlockVolumeSnapshotWCPEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
1682-
if !isBlockVolumeSnapshotWCPEnabled {
1683-
return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "deleteSnapshot")
1684-
}
16851674
deleteSnapshotInternal := func() (*csi.DeleteSnapshotResponse, error) {
16861675
csiSnapshotID := req.GetSnapshotId()
16871676
// Retrieve the supervisor volumesnapshot
@@ -1771,10 +1760,6 @@ func (c *controller) ListSnapshots(ctx context.Context, req *csi.ListSnapshotsRe
17711760
start := time.Now()
17721761
volumeType := prometheus.PrometheusBlockVolumeType
17731762
log.Infof("ListSnapshots: called with args %+v", *req)
1774-
isBlockVolumeSnapshotEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
1775-
if !isBlockVolumeSnapshotEnabled {
1776-
return nil, logger.LogNewErrorCode(log, codes.Unimplemented, "listSnapshot")
1777-
}
17781763
listSnapshotsInternal := func() (*csi.ListSnapshotsResponse, error) {
17791764
log.Infof("ListSnapshots: called with args %+v", *req)
17801765
maxEntries := common.QuerySnapshotLimit

‎pkg/internalapis/cnsvolumeoperationrequest/cnsvolumeoperationrequest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ var (
8585
// VolumeOperationRequest interface. Clients are unaware of the implementation
8686
// details to read and persist volume operation details.
8787
func InitVolumeOperationRequestInterface(ctx context.Context, cleanupInterval int,
88-
isBlockVolumeSnapshotEnabled func() bool, isPodVMOnStretchSupervisorEnabled bool) (
88+
isPodVMOnStretchSupervisorEnabled bool) (
8989
VolumeOperationRequest, error) {
9090
log := logger.GetLogger(ctx)
9191
csiNamespace = getCSINamespace()

‎pkg/syncer/admissionhandler/admissionhandler.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ var (
5656
// CO agnostic orchestrator in the admission handler package.
5757
COInitParams *interface{}
5858
featureGateCsiMigrationEnabled bool
59-
featureGateBlockVolumeSnapshotEnabled bool
6059
featureGateTKGSHaEnabled bool
6160
featureGateVolumeHealthEnabled bool
6261
featureGateTopologyAwareFileVolumeEnabled bool
@@ -146,7 +145,6 @@ func StartWebhookServer(ctx context.Context, enableWebhookClientCertVerification
146145
if clusterFlavor == cnstypes.CnsClusterFlavorWorkload {
147146
featureGateTKGSHaEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx, common.TKGsHA)
148147
featureGateVolumeHealthEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx, common.VolumeHealth)
149-
featureGateBlockVolumeSnapshotEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
150148
featureGateByokEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx, common.WCP_VMService_BYOK)
151149
featureIsSharedDiskEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx, common.SharedDiskFss)
152150
featureFileVolumesWithVmServiceEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx,
@@ -156,7 +154,6 @@ func StartWebhookServer(ctx context.Context, enableWebhookClientCertVerification
156154
return fmt.Errorf("unable to run the webhook manager: %w", err)
157155
}
158156
} else if clusterFlavor == cnstypes.CnsClusterFlavorGuest {
159-
featureGateBlockVolumeSnapshotEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
160157
startPVCSIWebhookManager(ctx)
161158
} else if clusterFlavor == cnstypes.CnsClusterFlavorVanilla {
162159
if cfg == nil {
@@ -168,11 +165,10 @@ func StartWebhookServer(ctx context.Context, enableWebhookClientCertVerification
168165
log.Debugf("webhook config: %v", cfg)
169166
}
170167
featureGateCsiMigrationEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx, common.CSIMigration)
171-
featureGateBlockVolumeSnapshotEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx, common.BlockVolumeSnapshot)
172168
featureGateTopologyAwareFileVolumeEnabled = containerOrchestratorUtility.IsFSSEnabled(ctx,
173169
common.TopologyAwareFileVolume)
174170

175-
if featureGateCsiMigrationEnabled || featureGateBlockVolumeSnapshotEnabled {
171+
if featureGateCsiMigrationEnabled {
176172
certs, err := tls.LoadX509KeyPair(cfg.WebHookConfig.CertFile, cfg.WebHookConfig.KeyFile)
177173
if err != nil {
178174
log.Errorf("failed to load key pair. certFile: %q, keyFile: %q err: %v",

0 commit comments

Comments
 (0)