Add PWB sharedStorage.subPath parity with homeStorage

charts/rstudio-workbench/Chart.yaml

@@ -1,6 +1,6 @@
 name: rstudio-workbench
 description: Official Helm chart for Posit Workbench
-version: 0.8.13
+version: 0.8.14
 apiVersion: v2
 appVersion: 2024.12.1
 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png

charts/rstudio-workbench/NEWS.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.8.14
+
+- Add `sharedStorage.subPath` for parity
+
 ## 0.8.13
 
 - Add `service.targetPort`

charts/rstudio-workbench/README.md

@@ -1,6 +1,6 @@
 # Posit Workbench
 
-![Version: 0.8.13](https://img.shields.io/badge/Version-0.8.13-informational?style=flat-square) ![AppVersion: 2024.12.1](https://img.shields.io/badge/AppVersion-2024.12.1-informational?style=flat-square)
+![Version: 0.8.14](https://img.shields.io/badge/Version-0.8.14-informational?style=flat-square) ![AppVersion: 2024.12.1](https://img.shields.io/badge/AppVersion-2024.12.1-informational?style=flat-square)
 
 #### _Official Helm chart for Posit Workbench_
 
@@ -24,11 +24,11 @@ To ensure a stable production deployment:
 
 ## Installing the chart
 
-To install the chart with the release name `my-release` at version 0.8.13:
+To install the chart with the release name `my-release` at version 0.8.14:
 
 ```{.bash}
 helm repo add rstudio https://helm.rstudio.com
-helm upgrade --install my-release rstudio/rstudio-workbench --version=0.8.13
+helm upgrade --install my-release rstudio/rstudio-workbench --version=0.8.14
 ```
 
 To explore other chart versions, look at:
@@ -510,7 +510,7 @@ Use of [Sealed secrets](https://github.com/bitnami-labs/sealed-secrets) disables
 | launcherPem | string | `""` | An inline launcher.pem key. If not provided, one will be auto-generated. See README for more details. |
 | launcherPub | bool | `false` | An inline launcher.pub key to pair with launcher.pem. If `false` (the default), we will try to generate a `launcher.pub` from the provided `launcher.pem` |
 | license.file | object | `{"contents":false,"mountPath":"/etc/rstudio-licensing","mountSubPath":false,"secret":false,"secretKey":"license.lic"}` | the file section is used for licensing with a license file |
-| license.file.contents | bool | `false` | contents is an in-line license file |
+| license.file.contents | bool | `false` | contents is an in-line license file, generally requiring the use of multi-line yaml notation |
 | license.file.mountPath | string | `"/etc/rstudio-licensing"` | mountPath is the place the license file will be mounted into the container |
 | license.file.mountSubPath | bool | `false` | It can be preferable _not_ to enable this, because then updates propagate automatically |
 | license.file.secret | bool | `false` | secret is an existing secret with a license file in it |
@@ -581,6 +581,7 @@ Use of [Sealed secrets](https://github.com/bitnami-labs/sealed-secrets) disables
 | sharedStorage.requests.storage | string | `"10Gi"` | the volume of storage to request for this persistent volume claim |
 | sharedStorage.selector | object | `{}` | selector for PVC definition |
 | sharedStorage.storageClassName | bool | `false` | storageClassName - the type of storage to use. Must allow ReadWriteMany |
+| sharedStorage.subPath | string | `""` | an optional subPath for the volume mount |
 | sharedStorage.volumeName | string | `""` | the volumeName passed along to the persistentVolumeClaim. Optional |
 | startupProbe | object | `{"enabled":false,"failureThreshold":30,"httpGet":{"path":"/health-check","port":8787},"initialDelaySeconds":10,"periodSeconds":10,"timeoutSeconds":1}` | startupProbe is used to configure the container's startupProbe |
 | startupProbe.failureThreshold | int | `30` | failureThreshold * periodSeconds should be strictly > worst case startup time |

charts/rstudio-workbench/templates/_helpers.tpl

@@ -99,6 +99,9 @@ containers:
     {{- if or .Values.sharedStorage.create .Values.sharedStorage.mount }}
     - name: rstudio-shared-storage
       mountPath: "{{ .Values.sharedStorage.path }}"
+      {{- if .Values.sharedStorage.subPath }}
+      subPath: "{{ .Values.sharedStorage.subPath }}"
+      {{- end }}
     {{- end }}
     {{- if or .Values.homeStorage.create .Values.homeStorage.mount }}
     - name: rstudio-home-storage

charts/rstudio-workbench/values.yaml

@@ -52,6 +52,8 @@ sharedStorage:
   # -- Define the annotations for the Persistent Volume Claim resource
   annotations:
     helm.sh/resource-policy: keep
+  # -- an optional subPath for the volume mount
+  subPath: ""
 
 # -- How to handle updates to the service. RollingUpdate (the default) minimizes downtime, but
 # will not work well if your license only allows a single activation.
@@ -255,7 +257,7 @@ license:
   server: false
   # -- the file section is used for licensing with a license file
   file:
-    # -- contents is an in-line license file
+    # -- contents is an in-line license file, generally requiring the use of multi-line yaml notation
     contents: false
     # -- mountPath is the place the license file will be mounted into the container
     mountPath: "/etc/rstudio-licensing"