fix : reset workspace storage defaults when PVC config removed

Previously, removing a workspace PVC Config (e.g., `perUserStrategyPvcConfig`)
did not reset workspaceConfig fields. As a result, stale values in persisted
instead of reverting to defaults.

This change explicitly resets:
- `StorageAccessMode` to `{ReadWriteOnce}`
- `StorageClassName` to `nil`
- `DefaultStorageSize` to `nil`

before applying any PVC config, ensuring that removing PVC config restores default
workspace storage settings.

Signed-off-by: Rohan Kumar <rohaan@redhat.com>

Author: rohanKanojia

pkg/common/constants/constants.go

@@ -12,6 +12,8 @@
 
 package constants
 
+import corev1 "k8s.io/api/core/v1"
+
 const (
 	// Dashboard
 	DefaultDashboardMemoryLimit   = "1024Mi"
@@ -145,4 +147,5 @@ var (
 		"app":       "che",
 		"component": "che-gateway-config",
 	}
+	DefaultWorkspaceStorageAccessMode = []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}
 )

pkg/deploy/dev-workspace-config/dev_workspace_config.go

@@ -176,7 +176,9 @@ func updateWorkspaceStorageConfig(devEnvironments *chev2.CheClusterDevEnvironmen
 		constants.CommonPVCStorageStrategy:       devEnvironments.Storage.PerUserStrategyPvcConfig,
 		constants.PerWorkspacePVCStorageStrategy: devEnvironments.Storage.PerWorkspaceStrategyPvcConfig,
 	}[pvcStrategy]
-
+	workspaceConfig.StorageAccessMode = constants.DefaultWorkspaceStorageAccessMode
+	workspaceConfig.StorageClassName = nil
+	workspaceConfig.DefaultStorageSize = nil
 	if pvc != nil {
 		workspaceConfig.StorageAccessMode = pvc.StorageAccessMode
 		if pvc.StorageClass != "" {

pkg/deploy/dev-workspace-config/dev_workspace_config_test.go

@@ -91,7 +91,7 @@ func TestReconcileDevWorkspaceConfigStorage(t *testing.T) {
 					},
 				},
 			},
-			expectedOperatorConfig: &controllerv1alpha1.OperatorConfiguration{Workspace: &controllerv1alpha1.WorkspaceConfig{DeploymentStrategy: "Recreate"}},
+			expectedOperatorConfig: &controllerv1alpha1.OperatorConfiguration{Workspace: &controllerv1alpha1.WorkspaceConfig{DeploymentStrategy: "Recreate", StorageAccessMode: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}}},
 		},
 		{
 			name: "Create DevWorkspaceOperatorConfig with ephemeral storage strategy",
@@ -117,7 +117,7 @@ func TestReconcileDevWorkspaceConfigStorage(t *testing.T) {
 					},
 				},
 			},
-			expectedOperatorConfig: &controllerv1alpha1.OperatorConfiguration{Workspace: &controllerv1alpha1.WorkspaceConfig{DeploymentStrategy: "Recreate"}},
+			expectedOperatorConfig: &controllerv1alpha1.OperatorConfiguration{Workspace: &controllerv1alpha1.WorkspaceConfig{DeploymentStrategy: "Recreate", StorageAccessMode: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}}},
 		},
 		{
 			name: "Create DevWorkspaceOperatorConfig with StorageClassName only",
@@ -175,6 +175,29 @@ func TestReconcileDevWorkspaceConfigStorage(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "Not setting PerUserStrategyPvcConfig should reset DevWorkspaceConfig to default StorageAccessMode",
+			cheCluster: &chev2.CheCluster{
+				ObjectMeta: metav1.ObjectMeta{
+					Namespace: "eclipse-che",
+					Name:      "eclipse-che",
+				},
+				Spec: chev2.CheClusterSpec{
+					DevEnvironments: chev2.CheClusterDevEnvironments{
+						DisableContainerBuildCapabilities: pointer.Bool(true),
+						Storage: chev2.WorkspaceStorage{
+							PvcStrategy: constants.PerUserPVCStorageStrategy,
+						},
+					},
+				},
+			},
+			expectedOperatorConfig: &controllerv1alpha1.OperatorConfiguration{
+				Workspace: &controllerv1alpha1.WorkspaceConfig{
+					StorageAccessMode:  []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
+					DeploymentStrategy: "Recreate",
+				},
+			},
+		},
 		{
 			name: "Create DevWorkspaceOperatorConfig with nil StorageAccessMode",
 			cheCluster: &chev2.CheCluster{
@@ -232,6 +255,7 @@ func TestReconcileDevWorkspaceConfigStorage(t *testing.T) {
 							corev1.ResourceMemory: resource.MustParse("64Mi"),
 						},
 					},
+					StorageAccessMode:  []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
 					DeploymentStrategy: "Recreate",
 				},
 			},
@@ -254,6 +278,7 @@ func TestReconcileDevWorkspaceConfigStorage(t *testing.T) {
 				Workspace: &controllerv1alpha1.WorkspaceConfig{
 					DefaultContainerResources: nil,
 					DeploymentStrategy:        "Recreate",
+					StorageAccessMode:         []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
 				},
 			},
 		},
@@ -522,7 +547,7 @@ func TestReconcileDevWorkspaceConfigForContainerCapabilities(t *testing.T) {
 				},
 			},
 			expectedOperatorConfig: &controllerv1alpha1.OperatorConfiguration{
-				Workspace: &controllerv1alpha1.WorkspaceConfig{},
+				Workspace: &controllerv1alpha1.WorkspaceConfig{StorageAccessMode: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}},
 			},
 		},
 		{
@@ -550,6 +575,7 @@ func TestReconcileDevWorkspaceConfigForContainerCapabilities(t *testing.T) {
 						},
 						AllowPrivilegeEscalation: pointer.Bool(true),
 					},
+					StorageAccessMode: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
 				},
 			},
 		},
@@ -599,6 +625,7 @@ func TestReconcileDevWorkspaceConfigForContainerCapabilities(t *testing.T) {
 						},
 					},
 					DeploymentStrategy: "Recreate",
+					StorageAccessMode:  []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
 				},
 			},
 		},
@@ -642,6 +669,7 @@ func TestReconcileDevWorkspaceConfigForContainerCapabilities(t *testing.T) {
 						},
 						AllowPrivilegeEscalation: pointer.Bool(true),
 					},
+					StorageAccessMode: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
 				},
 			},
 		},
@@ -679,12 +707,15 @@ func TestReconcileDevWorkspaceConfigForContainerCapabilities(t *testing.T) {
 							},
 								AllowPrivilegeEscalation: pointer.Bool(true),
 							},
+							StorageAccessMode: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
 						},
 					},
 				},
 			},
 			expectedOperatorConfig: &controllerv1alpha1.OperatorConfiguration{
-				Workspace: &controllerv1alpha1.WorkspaceConfig{},
+				Workspace: &controllerv1alpha1.WorkspaceConfig{
+					StorageAccessMode: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
+				},
 			},
 		},
 		{
@@ -733,6 +764,7 @@ func TestReconcileDevWorkspaceConfigForContainerCapabilities(t *testing.T) {
 						},
 					},
 					DeploymentStrategy: "Recreate",
+					StorageAccessMode:  []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
 				},
 			},
 		},
@@ -783,6 +815,7 @@ func TestReconcileDevWorkspaceConfigProgressTimeout(t *testing.T) {
 				Workspace: &controllerv1alpha1.WorkspaceConfig{
 					ProgressTimeout:    "600s",
 					DeploymentStrategy: "Recreate",
+					StorageAccessMode:  []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
 				},
 			},
 		},
@@ -817,7 +850,8 @@ func TestReconcileDevWorkspaceConfigProgressTimeout(t *testing.T) {
 			},
 			expectedOperatorConfig: &controllerv1alpha1.OperatorConfiguration{
 				Workspace: &controllerv1alpha1.WorkspaceConfig{
-					ProgressTimeout: "600s",
+					ProgressTimeout:   "600s",
+					StorageAccessMode: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
 				},
 			},
 		},
@@ -854,7 +888,8 @@ func TestReconcileDevWorkspaceConfigProgressTimeout(t *testing.T) {
 			},
 			expectedOperatorConfig: &controllerv1alpha1.OperatorConfiguration{
 				Workspace: &controllerv1alpha1.WorkspaceConfig{
-					ProgressTimeout: "420s",
+					ProgressTimeout:   "420s",
+					StorageAccessMode: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
 				},
 			},
 		},
@@ -889,7 +924,9 @@ func TestReconcileDevWorkspaceConfigProgressTimeout(t *testing.T) {
 				},
 			},
 			expectedOperatorConfig: &controllerv1alpha1.OperatorConfiguration{
-				Workspace: &controllerv1alpha1.WorkspaceConfig{},
+				Workspace: &controllerv1alpha1.WorkspaceConfig{
+					StorageAccessMode: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
+				},
 			},
 		},
 	}
@@ -1905,6 +1942,7 @@ func TestReconcileDevWorkspaceConfigPersistUserHome(t *testing.T) {
 					PersistUserHome: &controllerv1alpha1.PersistentHomeConfig{
 						Enabled: pointer.Bool(true),
 					},
+					StorageAccessMode: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
 				},
 			},
 		},
@@ -1940,6 +1978,7 @@ func TestReconcileDevWorkspaceConfigPersistUserHome(t *testing.T) {
 					PersistUserHome: &controllerv1alpha1.PersistentHomeConfig{
 						Enabled: pointer.Bool(true),
 					},
+					StorageAccessMode: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
 				},
 			},
 		},
@@ -1982,6 +2021,7 @@ func TestReconcileDevWorkspaceConfigPersistUserHome(t *testing.T) {
 					PersistUserHome: &controllerv1alpha1.PersistentHomeConfig{
 						Enabled: pointer.Bool(true),
 					},
+					StorageAccessMode: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
 				},
 			},
 		},
@@ -2026,6 +2066,7 @@ func TestReconcileDevWorkspaceConfigPersistUserHome(t *testing.T) {
 						Enabled:              pointer.Bool(true),
 						DisableInitContainer: pointer.Bool(true),
 					},
+					StorageAccessMode: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
 				},
 			},
 		},
@@ -2071,6 +2112,7 @@ func TestReconcileDevWorkspaceConfigPersistUserHome(t *testing.T) {
 						Enabled:              pointer.Bool(true),
 						DisableInitContainer: pointer.Bool(false),
 					},
+					StorageAccessMode: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
 				},
 			},
 		},
@@ -2113,6 +2155,7 @@ func TestReconcileDevWorkspaceConfigPersistUserHome(t *testing.T) {
 					PersistUserHome: &controllerv1alpha1.PersistentHomeConfig{
 						Enabled: pointer.Bool(false),
 					},
+					StorageAccessMode: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
 				},
 			},
 		},
@@ -2147,7 +2190,9 @@ func TestReconcileDevWorkspaceConfigPersistUserHome(t *testing.T) {
 				},
 			},
 			expectedOperatorConfig: &controllerv1alpha1.OperatorConfiguration{
-				Workspace: &controllerv1alpha1.WorkspaceConfig{},
+				Workspace: &controllerv1alpha1.WorkspaceConfig{
+					StorageAccessMode: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
+				},
 			},
 		},
 	}