Skip to content
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

Fix: disable persistent home when ephemeral storage used; persistent home volume shouldn't use capital letters #1210

Merged
merged 2 commits into from
Nov 23, 2023
Merged

Fix: disable persistent home when ephemeral storage used; persistent home volume shouldn't use capital letters #1210

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
5004255
Fix: persistent home volume name should not use capital letters
AObuchow Nov 23, 2023
4d83873
Fix: Don't add persistent home volume if workspace doesn't require pe…
AObuchow Nov 23, 2023
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 controllers/workspace/devworkspace_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
return r.failWorkspace(workspace, fmt.Sprintf("Error provisioning storage: %s", err), metrics.ReasonBadRequest, reqLogger, &reconcileStatus), nil
}

if home.NeedsPersistentHomeDirectory(workspace) {
if storageProvisioner.NeedsStorage(&workspace.Spec.Template) && home.NeedsPersistentHomeDirectory(workspace) {
workspaceWithHomeVolume, err := home.AddPersistentHomeVolume(workspace)
if err != nil {
reconcileStatus.addWarning(fmt.Sprintf("Info: default persistentHome volume is not being used: %s", err.Error()))
Expand Down
2 changes: 1 addition & 1 deletion pkg/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const (

HomeUserDirectory = "/home/user/"

HomeVolumeName = "persistentHome"
HomeVolumeName = "persistent-home"

ServiceAccount = "devworkspace"

Expand Down
4 changes: 2 additions & 2 deletions pkg/library/home/testdata/persistent-home/creates-home-vm-when-enabled.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ output:
volumeMounts:
- name: my-defined-volume
path: /my-defined-volume-path
- name: persistentHome
- name: persistent-home
path: /home/user/
- name: my-defined-volume
volume: {}
- name: persistentHome
- name: persistent-home
volume: {}
12 changes: 6 additions & 6 deletions pkg/library/home/testdata/persistent-home/noop-if-home-vm-name-used.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Does not create persistent home volume if a volume already named 'persistentHome'"
name: "Does not create persistent home volume if a volume is already named 'persistent-home'"

input:
devworkspaceId: "test-workspaceid"
Expand All @@ -14,7 +14,7 @@ input:
volumeMounts:
- name: my-defined-volume
path: /my-defined-volume-path
- name: persistentHome
- name: persistent-home
path: /some/path
- name: testing-container-2
container:
Expand All @@ -24,11 +24,11 @@ input:
path: /my-defined-volume-path
- name: my-defined-volume
volume: {}
- name: persistentHome
- name: persistent-home
volume: {}

output:
error: "addition of persistentHome volume would render DevWorkspace invalid: 1 error occurred:\n\t* duplicate key: persistentHome\n\n"
error: "addition of persistent-home volume would render DevWorkspace invalid: 1 error occurred:\n\t* duplicate key: persistent-home\n\n"
workspace:
components:
- name: testing-container-1
Expand All @@ -37,7 +37,7 @@ output:
volumeMounts:
- name: my-defined-volume
path: /my-defined-volume-path
- name: persistentHome
- name: persistent-home
path: /some/path
- name: testing-container-2
container:
Expand All @@ -47,5 +47,5 @@ output:
path: /my-defined-volume-path
- name: my-defined-volume
volume: {}
- name: persistentHome
- name: persistent-home
volume: {}
Loading