Skip to content

Commit fe4e7c1

Browse files
Remove volume-extend fss (#3392)
1 parent 0ec9586 commit fe4e7c1

File tree

7 files changed

+6
-23
lines changed

7 files changed

+6
-23
lines changed

manifests/guestcluster/1.33/pvcsi.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,6 @@ metadata:
660660
---
661661
apiVersion: v1
662662
data:
663-
"volume-extend": "true"
664663
"volume-health": "true"
665664
"online-volume-extend": "true"
666665
"file-volume": "true"

manifests/supervisorcluster/1.32/cns-csi.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,6 @@ spec:
549549
---
550550
apiVersion: v1
551551
data:
552-
"volume-extend": "true"
553552
"volume-health": "true"
554553
"online-volume-extend": "true"
555554
"file-volume": "true"

pkg/common/unittestcommon/utils.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ func GetFakeContainerOrchestratorInterface(orchestratorType int) (commonco.COCom
5959
fakeCO := &FakeK8SOrchestrator{
6060
featureStatesLock: &sync.RWMutex{},
6161
featureStates: map[string]string{
62-
"volume-extend": "true",
6362
"volume-health": "true",
6463
"csi-migration": "true",
6564
"file-volume": "true",

pkg/csi/service/common/constants.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,8 +379,7 @@ const (
379379
DefaultFeatureEnablementCheckInterval = 1 * time.Minute
380380
// VolumeHealth is the feature flag name for volume health.
381381
VolumeHealth = "volume-health"
382-
// VolumeExtend is feature flag name for volume expansion.
383-
VolumeExtend = "volume-extend"
382+
384383
// OnlineVolumeExtend guards the feature for online volume expansion.
385384
OnlineVolumeExtend = "online-volume-extend"
386385
// CSIMigration is feature flag for migrating in-tree vSphere volumes to CSI.

pkg/csi/service/wcp/controller.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2648,10 +2648,6 @@ func (c *controller) ControllerExpandVolume(ctx context.Context, req *csi.Contro
26482648
controllerExpandVolumeInternal := func() (
26492649
*csi.ControllerExpandVolumeResponse, string, error) {
26502650
var err error
2651-
if !commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.VolumeExtend) {
2652-
return nil, csifault.CSIUnimplementedFault, logger.LogNewErrorCode(log, codes.Unimplemented,
2653-
"expandVolume feature is disabled on the cluster")
2654-
}
26552651
log.Infof("ControllerExpandVolume: called with args %+v", *req)
26562652
// TODO: If the err is returned by invoking CNS API, then faultType should be
26572653
// populated by the underlying layer.

pkg/csi/service/wcpguest/controller.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1376,11 +1376,6 @@ func (c *controller) ControllerExpandVolume(ctx context.Context, req *csi.Contro
13761376

13771377
controllerExpandVolumeInternal := func() (
13781378
*csi.ControllerExpandVolumeResponse, string, error) {
1379-
if !commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.VolumeExtend) {
1380-
msg := "ExpandVolume feature is disabled on the cluster."
1381-
log.Warn(msg)
1382-
return nil, csifault.CSIUnimplementedFault, status.Error(codes.Unimplemented, msg)
1383-
}
13841379
log.Infof("ControllerExpandVolume: called with args %+v", *req)
13851380
// TODO: If the err is returned by invoking CNS API, then faultType should be
13861381
// populated by the underlying layer.

pkg/syncer/metadatasyncer.go

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -878,16 +878,12 @@ func InitMetadataSyncer(ctx context.Context, clusterFlavor cnstypes.CnsClusterFl
878878
go func() {
879879
for ; true; <-volumeResizeEnablementTicker.C {
880880
ctx, log = logger.GetNewContextWithLogger()
881-
if !metadataSyncer.coCommonInterface.IsFSSEnabled(ctx, common.VolumeExtend) {
882-
log.Debugf("ExpandVolume feature is disabled on the cluster")
883-
} else {
884-
if err := initResizeReconciler(ctx, k8sClient, metadataSyncer.supervisorClient); err != nil {
885-
log.Warnf("Error while initializing volume resize reconciler. Err:%+v. Retry will be triggered at %v",
886-
err, time.Now().Add(common.DefaultFeatureEnablementCheckInterval))
887-
continue
888-
}
889-
break
881+
if err := initResizeReconciler(ctx, k8sClient, metadataSyncer.supervisorClient); err != nil {
882+
log.Warnf("Error while initializing volume resize reconciler. Err:%+v. Retry will be triggered at %v",
883+
err, time.Now().Add(common.DefaultFeatureEnablementCheckInterval))
884+
continue
890885
}
886+
break
891887
}
892888
}()
893889
}

0 commit comments

Comments
 (0)