Resolve issue so subPath: true works correctly

charts/rstudio-connect/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: rstudio-library
   repository: file://../rstudio-library
-  version: 0.1.26
-digest: sha256:a44e6522d87fad58a52c147c0f46684f14934b392df1a9fd195e284b978ec378
-generated: "2023-07-21T10:31:31.079888-04:00"
+  version: 0.1.27
+digest: sha256:623d9c7ae9b9501578e55f4dd041a934cc67546c2a5608678d88ac538b2cef00
+generated: "2023-10-24T10:12:40.139874-04:00"

charts/rstudio-connect/Chart.yaml

@@ -1,6 +1,6 @@
 name: rstudio-connect
 description: Official Helm chart for RStudio Connect
-version: 0.5.7
+version: 0.5.8
 apiVersion: v2
 appVersion: 2023.09.0
 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
@@ -13,7 +13,7 @@ maintainers:
     url: https://github.com/sol-eng
 dependencies:
   - name: rstudio-library
-    version: 0.1.26
+    version: 0.1.27
     repository: file://../rstudio-library
 annotations:
   artifacthub.io/images: |

charts/rstudio-connect/NEWS.md

@@ -1,3 +1,8 @@
+# 0.5.8
+
+- Bump rstudio-library to `0.1.27`
+  - Fix an issue with `mountPath` and `subPath` when `license.file.mountSubPath` is `true`
+
 # 0.5.7
 
 - Add support for setting `tolerations` for Connect

charts/rstudio-connect/README.md

@@ -1,6 +1,6 @@
 # RStudio Connect
 
-![Version: 0.5.7](https://img.shields.io/badge/Version-0.5.7-informational?style=flat-square) ![AppVersion: 2023.09.0](https://img.shields.io/badge/AppVersion-2023.09.0-informational?style=flat-square)
+![Version: 0.5.8](https://img.shields.io/badge/Version-0.5.8-informational?style=flat-square) ![AppVersion: 2023.09.0](https://img.shields.io/badge/AppVersion-2023.09.0-informational?style=flat-square)
 
 #### _Official Helm chart for RStudio Connect_
 
@@ -26,11 +26,11 @@ To ensure reproducibility in your environment and insulate yourself from future
 
 ## Installing the Chart
 
-To install the chart with the release name `my-release` at version 0.5.7:
+To install the chart with the release name `my-release` at version 0.5.8:
 
 ```bash
 helm repo add rstudio https://helm.rstudio.com
-helm upgrade --install my-release rstudio/rstudio-connect --version=0.5.7
+helm upgrade --install my-release rstudio/rstudio-connect --version=0.5.8
 ```
 
 To explore other chart versions, take a look at:

charts/rstudio-launcher-rbac/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: rstudio-library
   repository: file://../rstudio-library
-  version: 0.1.26
-digest: sha256:a44e6522d87fad58a52c147c0f46684f14934b392df1a9fd195e284b978ec378
-generated: "2023-07-21T12:24:53.177096-04:00"
+  version: 0.1.27
+digest: sha256:623d9c7ae9b9501578e55f4dd041a934cc67546c2a5608678d88ac538b2cef00
+generated: "2023-10-24T10:18:58.864999-04:00"

charts/rstudio-launcher-rbac/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: rstudio-launcher-rbac
 description: RBAC definition for the RStudio Job Launcher
 type: application
-version: 0.2.17
-appVersion: 0.2.17
+version: 0.2.18
+appVersion: 0.2.18
 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
 sources:
   - https://github.com/rstudio/helm
@@ -13,7 +13,7 @@ maintainers:
     url: https://github.com/sol-eng
 dependencies:
   - name: rstudio-library
-    version: 0.1.26
+    version: 0.1.27
     repository: file://../rstudio-library
 keywords:
   - "data science"

charts/rstudio-launcher-rbac/NEWS.md

@@ -1,3 +1,8 @@
+# 0.2.18
+
+- Bump rstudio-library to `0.1.27`
+  - Fix an issue with `mountPath` and `subPath` when `license.file.mountSubPath` is `true`
+
 # 0.2.17
 
 - Update `rstudio-library` chart dependency

charts/rstudio-launcher-rbac/README.md

@@ -1,6 +1,6 @@
 # rstudio-launcher-rbac
 
-![Version: 0.2.17](https://img.shields.io/badge/Version-0.2.17-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.17](https://img.shields.io/badge/AppVersion-0.2.17-informational?style=flat-square)
+![Version: 0.2.18](https://img.shields.io/badge/Version-0.2.18-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.18](https://img.shields.io/badge/AppVersion-0.2.18-informational?style=flat-square)
 
 #### _RBAC definition for the RStudio Job Launcher_
 
@@ -18,11 +18,11 @@ To ensure a stable production deployment, please:
 
 ## Installing the Chart
 
-To install the chart with the release name `my-release` at version 0.2.17:
+To install the chart with the release name `my-release` at version 0.2.18:
 
 ```bash
 helm repo add rstudio https://helm.rstudio.com
-helm upgrade --install my-release rstudio/rstudio-launcher-rbac --version=0.2.17
+helm upgrade --install my-release rstudio/rstudio-launcher-rbac --version=0.2.18
 ```
 
 To explore other chart versions, take a look at:

charts/rstudio-library/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: rstudio-library
 description: Helm library helpers for use by Official RStudio charts
 type: library
-version: 0.1.26
-appVersion: 0.1.26
+version: 0.1.27
+appVersion: 0.1.27
 
 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
 home: https://www.rstudio.com

charts/rstudio-library/NEWS.md

@@ -1,3 +1,7 @@
+# 0.1.27
+
+- Fix an issue with `mountPath` and `subPath` when `license.file.mountSubPath` is `true` ([#427](https://github.com/rstudio/helm/issues/427)).
+
 # 0.1.26
 
 - Add the capability to add labels to service accounts

charts/rstudio-library/README.md

@@ -1,6 +1,6 @@
 # rstudio-library
 
-![Version: 0.1.26](https://img.shields.io/badge/Version-0.1.26-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: 0.1.26](https://img.shields.io/badge/AppVersion-0.1.26-informational?style=flat-square)
+![Version: 0.1.27](https://img.shields.io/badge/Version-0.1.27-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: 0.1.27](https://img.shields.io/badge/AppVersion-0.1.27-informational?style=flat-square)
 
 #### _Helm library helpers for use by Official RStudio charts_
 

charts/rstudio-library/templates/_license-mount.tpl

@@ -6,9 +6,11 @@
 {{- define "rstudio-library.license-mount" -}}
 {{- if or .license.file.contents .license.file.secret }}
 - name: license-file
-  mountPath: {{ .license.file.mountPath | quote }}
   {{- if .license.file.mountSubPath }}
+  mountPath: "{{ .license.file.mountPath }}/{{ .license.file.secretKey }}"
   subPath: {{ .license.file.secretKey | quote }}
+  {{ else }}
+  mountPath: {{ .license.file.mountPath | quote }}
   {{- end }}
 {{- end }}
 {{- end -}}{{- /* end define template */ -}}

charts/rstudio-pm/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: rstudio-library
   repository: file://../rstudio-library
-  version: 0.1.26
-digest: sha256:a44e6522d87fad58a52c147c0f46684f14934b392df1a9fd195e284b978ec378
-generated: "2023-07-21T12:24:55.582151-04:00"
+  version: 0.1.27
+digest: sha256:623d9c7ae9b9501578e55f4dd041a934cc67546c2a5608678d88ac538b2cef00
+generated: "2023-10-24T10:12:51.381873-04:00"

charts/rstudio-pm/Chart.yaml

@@ -1,6 +1,6 @@
 name: rstudio-pm
 description: Official Helm chart for RStudio Package Manager
-version: 0.5.14
+version: 0.5.15
 apiVersion: v2
 appVersion: 2023.08.0
 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
@@ -14,7 +14,7 @@ maintainers:
     url: https://github.com/rstudio/helm
 dependencies:
   - name: rstudio-library
-    version: 0.1.26
+    version: 0.1.27
     repository: file://../rstudio-library
 annotations:
   artifacthub.io/images: |

charts/rstudio-pm/NEWS.md

@@ -1,3 +1,8 @@
+# 0.5.15
+
+- Bump rstudio-library to `0.1.27`
+  - Fix an issue with `mountPath` and `subPath` when `license.file.mountSubPath` is `true`
+
 # 0.5.14
 
 - Update default Posit Package Manager version to 2023.08.0-16

charts/rstudio-pm/README.md

@@ -1,6 +1,6 @@
 # RStudio Package Manager
 
-![Version: 0.5.14](https://img.shields.io/badge/Version-0.5.14-informational?style=flat-square) ![AppVersion: 2023.08.0](https://img.shields.io/badge/AppVersion-2023.08.0-informational?style=flat-square)
+![Version: 0.5.15](https://img.shields.io/badge/Version-0.5.15-informational?style=flat-square) ![AppVersion: 2023.08.0](https://img.shields.io/badge/AppVersion-2023.08.0-informational?style=flat-square)
 
 #### _Official Helm chart for RStudio Package Manager_
 
@@ -21,11 +21,11 @@ To ensure a stable production deployment, please:
 
 ## Installing the Chart
 
-To install the chart with the release name `my-release` at version 0.5.14:
+To install the chart with the release name `my-release` at version 0.5.15:
 
 ```bash
 helm repo add rstudio https://helm.rstudio.com
-helm upgrade --install my-release rstudio/rstudio-pm --version=0.5.14
+helm upgrade --install my-release rstudio/rstudio-pm --version=0.5.15
 ```
 
 To explore other chart versions, take a look at:

charts/rstudio-workbench/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: rstudio-library
   repository: file://../rstudio-library
-  version: 0.1.26
-digest: sha256:a44e6522d87fad58a52c147c0f46684f14934b392df1a9fd195e284b978ec378
-generated: "2023-07-21T12:24:58.270579-04:00"
+  version: 0.1.27
+digest: sha256:623d9c7ae9b9501578e55f4dd041a934cc67546c2a5608678d88ac538b2cef00
+generated: "2023-10-24T10:12:25.831246-04:00"

charts/rstudio-workbench/Chart.yaml

@@ -1,6 +1,6 @@
 name: rstudio-workbench
 description: Official Helm chart for RStudio Workbench
-version: 0.6.9
+version: 0.6.10
 apiVersion: v2
 appVersion: 2023.09.1
 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
@@ -13,7 +13,7 @@ maintainers:
     url: https://github.com/sol-eng
 dependencies:
   - name: rstudio-library
-    version: 0.1.26
+    version: 0.1.27
     repository: file://../rstudio-library
 annotations:
   artifacthub.io/images: |

charts/rstudio-workbench/NEWS.md

@@ -1,3 +1,8 @@
+# 0.6.10
+
+- Bump rstudio-library to `0.1.27`
+  - Fix an issue with `mountPath` and `subPath` when `license.file.mountSubPath` is `true`
+
 # 0.6.9
 
 - Bump Workbench version to 2023.09.1

charts/rstudio-workbench/README.md

@@ -1,6 +1,6 @@
 # RStudio Workbench
 
-![Version: 0.6.9](https://img.shields.io/badge/Version-0.6.9-informational?style=flat-square) ![AppVersion: 2023.09.1](https://img.shields.io/badge/AppVersion-2023.09.1-informational?style=flat-square)
+![Version: 0.6.10](https://img.shields.io/badge/Version-0.6.10-informational?style=flat-square) ![AppVersion: 2023.09.1](https://img.shields.io/badge/AppVersion-2023.09.1-informational?style=flat-square)
 
 #### _Official Helm chart for RStudio Workbench_
 
@@ -27,11 +27,11 @@ To ensure a stable production deployment, please:
 
 ## Installing the Chart
 
-To install the chart with the release name `my-release` at version 0.6.9:
+To install the chart with the release name `my-release` at version 0.6.10:
 
 ```bash
 helm repo add rstudio https://helm.rstudio.com
-helm upgrade --install my-release rstudio/rstudio-workbench --version=0.6.9
+helm upgrade --install my-release rstudio/rstudio-workbench --version=0.6.10
 ```
 
 To explore other chart versions, take a look at:

examples/rbac/rstudio-launcher-rbac-0.2.18.yaml

@@ -0,0 +1,88 @@
+---
+# Source: rstudio-launcher-rbac/templates/rbac.yaml
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: rstudio-launcher-rbac
+---
+# Source: rstudio-launcher-rbac/templates/rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: rstudio-launcher-rbac
+rules:
+  - apiGroups:
+    - ""
+    resources:
+    - "serviceaccounts"
+    verbs:
+    - "list"
+  - apiGroups:
+      - ""
+    resources:
+      - "pods/log"
+    verbs:
+      - "get"
+      - "watch"
+      - "list"
+  - apiGroups:
+      - ""
+    resources:
+      - "pods"
+      - "pods/attach"
+      - "pods/exec"
+    verbs:
+      - "get"
+      - "create"
+      - "update"
+      - "patch"
+      - "watch"
+      - "list"
+      - "delete"
+  - apiGroups:
+      - ""
+    resources:
+      - "events"
+    verbs:
+      - "watch"
+  - apiGroups:
+      - ""
+    resources:
+      - "services"
+    verbs:
+      - "create"
+      - "get"
+      - "watch"
+      - "list"
+      - "delete"
+  - apiGroups:
+      - "batch"
+    resources:
+      - "jobs"
+    verbs:
+      - "create"
+      - "update"
+      - "patch"
+      - "get"
+      - "watch"
+      - "list"
+      - "delete"
+  - apiGroups:
+      - "metrics.k8s.io"
+    resources:
+      - "pods"
+    verbs:
+      - "get"
+---
+# Source: rstudio-launcher-rbac/templates/rbac.yaml
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: rstudio-launcher-rbac
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: rstudio-launcher-rbac
+subjects:
+  - kind: ServiceAccount
+    name: rstudio-launcher-rbac