Signed-off-by: v.oleynikov <vasily.oleynikov@flant.com>

deckhouse · Feb 20, 2025 · 408fe1d · 408fe1d
1 parent 29ac7a9
commit 408fe1d
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/images/sds-local-volume-csi/src/driver/controller.go b/images/sds-local-volume-csi/src/driver/controller.go
@@ -255,7 +255,7 @@ func (d *Driver) CreateVolume(ctx context.Context, request *csi.CreateVolumeRequ
 		d.log.Error(err, fmt.Sprintf("[CreateVolume][traceID:%s][volumeID:%s] error WaitForStatusUpdate. Delete LVMLogicalVolume %s", traceID, volumeID, request.Name))
 
 		volumeCleanup := "disable"
-		if feature.DataEraseEnabled() {
+		if feature.VolumeCleanupEnabled() {
 			localStorageClass, _ := utils.GetLSCBeforeLLVDelete(*d.log, d.cl, ctx, request.Name, traceID)
 			if localStorageClass != nil && localStorageClass.Spec.LVM != nil && localStorageClass.Spec.LVM.Thick != nil && localStorageClass.Spec.LVM.Thick.VolumeCleanup != "" {
 				volumeCleanup = localStorageClass.Spec.LVM.Thick.VolumeCleanup
@@ -310,7 +310,7 @@ func (d *Driver) DeleteVolume(ctx context.Context, request *csi.DeleteVolumeRequ
 	}
 
 	volumeCleanup := "disable"
-	if feature.DataEraseEnabled() {
+	if feature.VolumeCleanupEnabled() {
 		localStorageClass, _ := utils.GetLSCBeforeLLVDelete(*d.log, d.cl, ctx, request.VolumeId, traceID)
 		if localStorageClass != nil && localStorageClass.Spec.LVM != nil && localStorageClass.Spec.LVM.Thick != nil && localStorageClass.Spec.LVM.Thick.VolumeCleanup != "" {
 			volumeCleanup = localStorageClass.Spec.LVM.Thick.VolumeCleanup

diff --git a/lib/go/common/pkg/feature/const_ce.go b/lib/go/common/pkg/feature/const_ce.go
@@ -16,4 +16,4 @@ limitations under the License.
 package feature
 
 const snapshotsEnabled = false
-const dataEraseEnabled = false
+const volumeCleanupEnabled = false
diff --git a/lib/go/common/pkg/feature/const_csepro.go b/lib/go/common/pkg/feature/const_csepro.go
@@ -9,4 +9,4 @@ See https://github.com/deckhouse/deckhouse/blob/main/ee/LICENSE
 package feature
 
 const snapshotsEnabled = true
-const dataEraseEnabled = true
+const volumeCleanupEnabled = true
diff --git a/lib/go/common/pkg/feature/const_ee.go b/lib/go/common/pkg/feature/const_ee.go
@@ -9,4 +9,4 @@ See https://github.com/deckhouse/deckhouse/blob/main/ee/LICENSE
 package feature
 
 const snapshotsEnabled = true
-const dataEraseEnabled = true
+const volumeCleanupEnabled = true
diff --git a/lib/go/common/pkg/feature/const_se.go b/lib/go/common/pkg/feature/const_se.go
@@ -9,4 +9,4 @@ See https://github.com/deckhouse/deckhouse/blob/main/ee/LICENSE
 package feature
 
 const snapshotsEnabled = true
-const dataEraseEnabled = true
+const volumeCleanupEnabled = true
diff --git a/lib/go/common/pkg/feature/const_seplus.go b/lib/go/common/pkg/feature/const_seplus.go
@@ -9,4 +9,4 @@ See https://github.com/deckhouse/deckhouse/blob/main/ee/LICENSE
 package feature
 
 const snapshotsEnabled = true
-const dataEraseEnabled = true
+const volumeCleanupEnabled = true
diff --git a/lib/go/common/pkg/feature/feature.go b/lib/go/common/pkg/feature/feature.go
@@ -4,6 +4,6 @@ func SnapshotsEnabled() bool {
 	return snapshotsEnabled
 }
 
-func DataEraseEnabled() bool {
-	return dataEraseEnabled
+func VolumeCleanupEnabled() bool {
+	return volumeCleanupEnabled
 }