Skip to content

fix : reset workspace storage defaults when PVC config removed #2061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tolusha merged 1 commit into from
Nov 12, 2025
Merged

fix : reset workspace storage defaults when PVC config removed #2061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/deploy/dev-workspace-config/dev_workspace_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,9 @@ func updateWorkspaceStorageConfig(devEnvironments *chev2.CheClusterDevEnvironmen
constants.CommonPVCStorageStrategy: devEnvironments.Storage.PerUserStrategyPvcConfig,
constants.PerWorkspacePVCStorageStrategy: devEnvironments.Storage.PerWorkspaceStrategyPvcConfig,
}[pvcStrategy]

workspaceConfig.StorageAccessMode = nil
workspaceConfig.StorageClassName = nil
workspaceConfig.DefaultStorageSize = nil
if pvc != nil {
workspaceConfig.StorageAccessMode = pvc.StorageAccessMode
if pvc.StorageClass != "" {
Expand Down
22 changes: 22 additions & 0 deletions pkg/deploy/dev-workspace-config/dev_workspace_config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,28 @@ 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{
DeploymentStrategy: "Recreate",
},
},
},
{
name: "Create DevWorkspaceOperatorConfig with nil StorageAccessMode",
cheCluster: &chev2.CheCluster{
Expand Down