add option to set subdir on the PVC volume mount for Connect and Work…

…bench
rstudio · Aug 7, 2023 · 9bfce10 · 9bfce10
1 parent 02aa7f6
commit 9bfce10
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/charts/rstudio-connect/templates/deployment.yaml b/charts/rstudio-connect/templates/deployment.yaml
@@ -150,6 +150,9 @@ spec:
           {{- if or .Values.sharedStorage.create .Values.sharedStorage.mount }}
           - name: rstudio-connect-data
             mountPath: "{{ .Values.sharedStorage.path }}"
+            {{- if .Values.sharedStorage.subPath }}
+            subPath: "{{ .Values.sharedStorage.subPath }}"
+            {{- end }}
           {{- end }}
           {{ include "rstudio-library.license-mount" (dict "license" ( .Values.license )) | indent 10 }}
       {{- if .Values.pod.volumeMounts }}

diff --git a/charts/rstudio-connect/values.yaml b/charts/rstudio-connect/values.yaml
@@ -32,6 +32,8 @@ sharedStorage:
   selector: {}
   # -- the volumeName passed along to the persistentVolumeClaim. Optional
   volumeName: ""
+  # -- an optional subPath for the volume mount
+  subPath: ""
 
 rbac:
   # -- Whether to create rbac. (also depends on launcher.enabled = true)

diff --git a/charts/rstudio-workbench/templates/_helpers.tpl b/charts/rstudio-workbench/templates/_helpers.tpl
@@ -99,6 +99,9 @@ containers:
     {{- if or .Values.homeStorage.create .Values.homeStorage.mount }}
     - name: rstudio-home-storage
       mountPath: "{{ .Values.homeStorage.path }}"
+      {{- if .Values.homeStorage.subPath }}
+      subPath: "{{ .Values.homeStorage.subPath }}"
+      {{- end }}
     {{- end }}
     - name: rstudio-prestart
       mountPath: "/scripts/"

diff --git a/charts/rstudio-workbench/values.yaml b/charts/rstudio-workbench/values.yaml
@@ -128,6 +128,8 @@ homeStorage:
   selector: {}
   # -- the volumeName passed along to the persistentVolumeClaim. Optional
   volumeName: ""
+  # -- an optional subPath for the volume mount
+  subPath: ""
 
 image:
   # -- the repository to use for the main pod image