From cf588ef02b103e21091b11479c70dba3f104d369 Mon Sep 17 00:00:00 2001 From: Sam Cofer Date: Thu, 27 Mar 2025 11:12:58 -0500 Subject: [PATCH 1/7] feat: Add pwb sharedStorage subPath parity with homeStorage --- charts/rstudio-workbench/templates/_helpers.tpl | 3 +++ charts/rstudio-workbench/values.yaml | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/rstudio-workbench/templates/_helpers.tpl b/charts/rstudio-workbench/templates/_helpers.tpl index 57f3cf728..814e180b0 100644 --- a/charts/rstudio-workbench/templates/_helpers.tpl +++ b/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 diff --git a/charts/rstudio-workbench/values.yaml b/charts/rstudio-workbench/values.yaml index cecc98b73..c7a73a1d7 100644 --- a/charts/rstudio-workbench/values.yaml +++ b/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. @@ -251,7 +253,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 such as | contents: false # -- mountPath is the place the license file will be mounted into the container mountPath: "/etc/rstudio-licensing" From 5b102695dac2b1019f513fab052a716ce9f0dbc2 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 27 Mar 2025 16:24:39 +0000 Subject: [PATCH 2/7] Update helm-docs and README.md --- charts/rstudio-workbench/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/rstudio-workbench/README.md b/charts/rstudio-workbench/README.md index 2b5700ea6..f1e373839 100644 --- a/charts/rstudio-workbench/README.md +++ b/charts/rstudio-workbench/README.md @@ -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 such as | | | 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 | @@ -579,6 +579,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 | From ae5a4db8afc9500f89c817c6a352cb70ae6028e7 Mon Sep 17 00:00:00 2001 From: Sam Cofer Date: Thu, 27 Mar 2025 11:30:23 -0500 Subject: [PATCH 3/7] Remove | from values.yaml to avoid breaking the README --- charts/rstudio-workbench/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rstudio-workbench/values.yaml b/charts/rstudio-workbench/values.yaml index c7a73a1d7..dcae7004b 100644 --- a/charts/rstudio-workbench/values.yaml +++ b/charts/rstudio-workbench/values.yaml @@ -253,7 +253,7 @@ license: server: false # -- the file section is used for licensing with a license file file: - # -- contents is an in-line license file, generally requiring the use of multi-line yaml notation such as | + # -- 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" From 82e9a670635466f9fc8cd15433c9a9270aa89c81 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 27 Mar 2025 16:31:34 +0000 Subject: [PATCH 4/7] Update helm-docs and README.md --- charts/rstudio-workbench/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rstudio-workbench/README.md b/charts/rstudio-workbench/README.md index f1e373839..f75e86a57 100644 --- a/charts/rstudio-workbench/README.md +++ b/charts/rstudio-workbench/README.md @@ -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, generally requiring the use of multi-line yaml notation such as | | +| 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 | From 535b5d66cbf58f7d1bee735b9dbf3a8367c8f61f Mon Sep 17 00:00:00 2001 From: Sam Cofer Date: Thu, 27 Mar 2025 15:43:49 -0500 Subject: [PATCH 5/7] Update NEWS and Chart Version --- charts/rstudio-workbench/Chart.yaml | 2 +- charts/rstudio-workbench/NEWS.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/rstudio-workbench/Chart.yaml b/charts/rstudio-workbench/Chart.yaml index 1dfc2c848..75773a049 100644 --- a/charts/rstudio-workbench/Chart.yaml +++ b/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 diff --git a/charts/rstudio-workbench/NEWS.md b/charts/rstudio-workbench/NEWS.md index f68e1422b..35bd174c5 100644 --- a/charts/rstudio-workbench/NEWS.md +++ b/charts/rstudio-workbench/NEWS.md @@ -1,5 +1,9 @@ # Changelog +## 0.8.14 + +- Add `sharedStorage.subPath` + ## 0.8.13 - Add `service.targetPort` From 38d9abb267524e92e82f27c16e2f4bfeb5619788 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 27 Mar 2025 20:44:56 +0000 Subject: [PATCH 6/7] Update helm-docs and README.md --- charts/rstudio-workbench/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/rstudio-workbench/README.md b/charts/rstudio-workbench/README.md index d1be5a0d8..5b67a8f94 100644 --- a/charts/rstudio-workbench/README.md +++ b/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: From 81ecb7cebe21721c53da3fb3085b7655d28d6caa Mon Sep 17 00:00:00 2001 From: Sam Cofer Date: Thu, 27 Mar 2025 20:57:09 -0500 Subject: [PATCH 7/7] Update NEWS for clarity --- charts/rstudio-workbench/NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rstudio-workbench/NEWS.md b/charts/rstudio-workbench/NEWS.md index 35bd174c5..22f1118f0 100644 --- a/charts/rstudio-workbench/NEWS.md +++ b/charts/rstudio-workbench/NEWS.md @@ -2,7 +2,7 @@ ## 0.8.14 -- Add `sharedStorage.subPath` +- Add `sharedStorage.subPath` for parity ## 0.8.13