Skip to content

Cherry pick #870 to 0.15.x branch#872

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
amisevsk merged 2 commits into from
Jun 16, 2022
Merged

Cherry pick #870 to 0.15.x branch #872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4bd242
Format code after release job
amisevsk Jun 16, 2022
3c25b8f
Fix issue where deleting a workspace deletes the PVC incorrectly
amisevsk Jun 15, 2022
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
2 changes: 1 addition & 1 deletion apis/controller/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/provision/storage/commonStorage.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -94,7 +94,7 @@ func (p *CommonStorageProvisioner) CleanupWorkspaceStorage(workspace *dw.DevWork

// If the number of common + async workspaces that exist (started or stopped) is zero,
// delete common PVC instead of running cleanup job
if totalWorkspaces > 1 {
if totalWorkspaces > 0 {
return runCommonPVCCleanupJob(workspace, clusterAPI)
} else {
sharedPVC := &corev1.PersistentVolumeClaim{}
Expand Down