Reverted changes to volume manager

Added CnsPVCProtectionCleanupIntervalInMin to Config and a watcher for it

Author: kolluria

pkg/common/cns-lib/volume/manager.go

@@ -3532,6 +3532,7 @@ func constructBatchAttachSpecList(ctx context.Context, vm *cnsvsphere.VirtualMac
 			Sharing:         volume.SharingMode,
 			DiskMode:        volume.DiskMode,
 			BackingTypeName: cnstypes.CnsVolumeBackingType(volume.BackingType),
+			VolumeEncrypted: volume.VolumeEncrypted,
 		}
 
 		// Set controllerKey and unitNumber only if they are provided by the user.
@@ -3541,11 +3542,6 @@ func constructBatchAttachSpecList(ctx context.Context, vm *cnsvsphere.VirtualMac
 		if volume.UnitNumber != nil {
 			cnsAttachDetachSpec.UnitNumber = volume.UnitNumber
 		}
-		// Set volumeEncrypted only if it's provided and encryption is enabled.
-		// This field is not supported by older vCenter versions, so we only set it when needed.
-		if volume.VolumeEncrypted != nil && *volume.VolumeEncrypted {
-			cnsAttachDetachSpec.VolumeEncrypted = volume.VolumeEncrypted
-		}
 		cnsAttachSpecList = append(cnsAttachSpecList, cnsAttachDetachSpec)
 	}
 

pkg/common/config/config.go

@@ -68,6 +68,10 @@ const (
 	// interval after which successful CnsRegisterVolumes will be cleaned up.
 	// Current default value is set to 12 hours
 	DefaultCnsRegisterVolumesCleanupIntervalInMin = 720
+	// DefaultCnsPVCProtectionCleanupIntervalInMin is the default time interval after which
+	// orphaned PVCs will be cleaned up.
+	// Current default value is set to 12 hours
+	DefaultCnsPVCProtectionCleanupIntervalInMin = 720
 	// DefaultVolumeMigrationCRCleanupIntervalInMin is the default time interval
 	// after which stale CnsVSphereVolumeMigration CRs will be cleaned up.
 	// Current default value is set to 2 hours.
@@ -451,6 +455,9 @@ func validateConfig(ctx context.Context, cfg *Config) error {
 	if cfg.Global.CnsRegisterVolumesCleanupIntervalInMin == 0 {
 		cfg.Global.CnsRegisterVolumesCleanupIntervalInMin = DefaultCnsRegisterVolumesCleanupIntervalInMin
 	}
+	if cfg.Global.CnsPVCProtectionCleanupIntervalInMin == 0 {
+		cfg.Global.CnsPVCProtectionCleanupIntervalInMin = DefaultCnsPVCProtectionCleanupIntervalInMin
+	}
 	if cfg.Global.VolumeMigrationCRCleanupIntervalInMin == 0 {
 		cfg.Global.VolumeMigrationCRCleanupIntervalInMin = DefaultVolumeMigrationCRCleanupIntervalInMin
 	}

pkg/common/config/types.go

@@ -51,6 +51,9 @@ type Config struct {
 		// CnsRegisterVolumesCleanupIntervalInMin specifies the interval after which
 		// successful CnsRegisterVolumes will be cleaned up.
 		CnsRegisterVolumesCleanupIntervalInMin int `gcfg:"cnsregistervolumes-cleanup-intervalinmin"`
+		// CnsPVCProtectionCleanupIntervalInMin specifies the interval after which
+		// orphaned PVCs will be cleaned up.
+		CnsPVCProtectionCleanupIntervalInMin int `gcfg:"cnspvcprotection-cleanup-intervalinmin"`
 		// VolumeMigrationCRCleanupIntervalInMin specifies the interval after which
 		// stale CnsVSphereVolumeMigration CRs will be cleaned up.
 		VolumeMigrationCRCleanupIntervalInMin int `gcfg:"volumemigration-cr-cleanup-intervalinmin"`

pkg/syncer/cnsoperator/manager/init.go

@@ -138,6 +138,13 @@ func InitCnsOperator(ctx context.Context, clusterFlavor cnstypes.CnsClusterFlavo
 				return err
 			}
 
+			err = watcher(ctx, cnsOperator)
+			if err != nil {
+				log.Error("Failed to watch on config file for changes to "+
+					"CnsPVCProtectionCleanupIntervalInMin. Error: %+v", err)
+				return err
+			}
+
 			// Start cleanup routine to remove orphaned PVC finalizers.
 			// This handles cases where CnsNodeVMBatchAttachment CRs are deleted before
 			// removing finalizers from their associated PVCs.
@@ -148,7 +155,7 @@ func InitCnsOperator(ctx context.Context, clusterFlavor cnstypes.CnsClusterFlavo
 					log.Info("Triggering PVC finalizer cleanup routine")
 					cleanupPVCs(ctx, *restConfig)
 					log.Info("Completed PVC finalizer cleanup")
-					for i := 1; i <= 2; i++ {
+					for i := 1; i <= cnsOperator.configInfo.Cfg.Global.CnsPVCProtectionCleanupIntervalInMin; i++ {
 						time.Sleep(1 * time.Minute)
 					}
 				}