From 6656debcd6264c6d3eef4a39fe38c74a52fe267c Mon Sep 17 00:00:00 2001 From: Matt Fernandez Date: Fri, 30 Oct 2026 12:49:08 -0600 Subject: [PATCH] Expose optional Dev Spaces workspace PVC strategy --- .../ocp4_workload_devspaces/defaults/main.yml | 5 ++++ roles/ocp4_workload_devspaces/readme.adoc | 25 +++++++++++++++++++ .../templates/checluster.yaml.j2 | 4 +++ 3 files changed, 34 insertions(+) diff --git a/roles/ocp4_workload_devspaces/defaults/main.yml b/roles/ocp4_workload_devspaces/defaults/main.yml index ada366bf..a9982d66 100644 --- a/roles/ocp4_workload_devspaces/defaults/main.yml +++ b/roles/ocp4_workload_devspaces/defaults/main.yml @@ -12,6 +12,11 @@ ocp4_workload_devspaces_namespace: openshift-devspaces ocp4_workload_devspaces_max_number_of_workspaces: 2 ocp4_workload_devspaces_max_number_of_running_workspaces: 1 +# Optional storage strategy: per-user, per-workspace, or ephemeral. +# Leave empty to retain the operator default or existing cluster configuration. +# Independent per-workspace volumes support concurrent workspaces on RWO storage. +ocp4_workload_devspaces_pvc_strategy: "" + ocp4_workload_devspaces_setup_devworkspaces: false ocp4_workload_devspaces_devworkspace_devfile: >- http://devspaces-dashboard.openshift-devspaces.svc.cluster.local:8080/dashboard/api/editors/devfile?che-editor=che-incubator/che-code/latest diff --git a/roles/ocp4_workload_devspaces/readme.adoc b/roles/ocp4_workload_devspaces/readme.adoc index dfbf029d..dc68711f 100644 --- a/roles/ocp4_workload_devspaces/readme.adoc +++ b/roles/ocp4_workload_devspaces/readme.adoc @@ -3,3 +3,28 @@ == Role overview This role installs Red Hat OpenShift Dev Spaces into an OpenShift Cluster. + +== Concurrent workspaces and storage + +The role defaults to two saved workspaces and one running workspace. Storage is +left unspecified, preserving the existing configuration or the Dev Spaces +operator's `per-user` default. To run two workspaces at the same time with independent +persistent volumes, set: + +[source,yaml] +---- +ocp4_workload_devspaces_max_number_of_workspaces: 2 +ocp4_workload_devspaces_max_number_of_running_workspaces: 2 +ocp4_workload_devspaces_pvc_strategy: per-workspace +---- + +`ocp4_workload_devspaces_pvc_strategy` accepts an empty string (the default), +`per-user`, `per-workspace`, or `ephemeral`. With ReadWriteOnce volumes, +concurrent workspaces sharing a per-user +volume can encounter attachment failures when scheduled on different nodes. +Use `per-workspace` to give each workspace its own persistent volume. `ephemeral` +storage does not preserve local changes when a workspace stops. + +The storage default applies to newly created workspaces. Changing it does not +migrate existing workspace files or PVCs; back up local work before recreating +an existing workspace with a different storage strategy. diff --git a/roles/ocp4_workload_devspaces/templates/checluster.yaml.j2 b/roles/ocp4_workload_devspaces/templates/checluster.yaml.j2 index 40053d3f..c84aca16 100644 --- a/roles/ocp4_workload_devspaces/templates/checluster.yaml.j2 +++ b/roles/ocp4_workload_devspaces/templates/checluster.yaml.j2 @@ -23,3 +23,7 @@ spec: secondsOfInactivityBeforeIdling: -1 maxNumberOfWorkspacesPerUser: {{ ocp4_workload_devspaces_max_number_of_workspaces }} maxNumberOfRunningWorkspacesPerUser: {{ ocp4_workload_devspaces_max_number_of_running_workspaces }} +{% if ocp4_workload_devspaces_pvc_strategy | length > 0 %} + storage: + pvcStrategy: {{ ocp4_workload_devspaces_pvc_strategy }} +{% endif %}