diff --git a/charts/rstudio-workbench/Chart.yaml b/charts/rstudio-workbench/Chart.yaml index 7c08c3de..25672a15 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 RStudio Workbench -version: 0.6.5 +version: 0.6.6 apiVersion: v2 appVersion: 2023.06.0 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 4f61ae2a..5dfd3966 100644 --- a/charts/rstudio-workbench/NEWS.md +++ b/charts/rstudio-workbench/NEWS.md @@ -1,3 +1,9 @@ +# 0.6.6 + +- Add native session support for `pip.conf` + - In order to mount a `pip.conf` file to `/etc/pip.conf` on server and sessions, + just define the file in `config.session.pip\\.conf` + # 0.6.5 - Add support for `homeStorage.subPath` (and for launcher sessions) diff --git a/charts/rstudio-workbench/README.md b/charts/rstudio-workbench/README.md index d192cc06..bd3a8fc9 100644 --- a/charts/rstudio-workbench/README.md +++ b/charts/rstudio-workbench/README.md @@ -1,6 +1,6 @@ # RStudio Workbench -![Version: 0.6.5](https://img.shields.io/badge/Version-0.6.5-informational?style=flat-square) ![AppVersion: 2023.06.0](https://img.shields.io/badge/AppVersion-2023.06.0-informational?style=flat-square) +![Version: 0.6.6](https://img.shields.io/badge/Version-0.6.6-informational?style=flat-square) ![AppVersion: 2023.06.0](https://img.shields.io/badge/AppVersion-2023.06.0-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.5: +To install the chart with the release name `my-release` at version 0.6.6: ```bash helm repo add rstudio https://helm.rstudio.com -helm upgrade --install my-release rstudio/rstudio-workbench --version=0.6.5 +helm upgrade --install my-release rstudio/rstudio-workbench --version=0.6.6 ``` To explore other chart versions, take a look at: diff --git a/charts/rstudio-workbench/templates/_helpers.tpl b/charts/rstudio-workbench/templates/_helpers.tpl index 95bfdc8b..c3d13148 100644 --- a/charts/rstudio-workbench/templates/_helpers.tpl +++ b/charts/rstudio-workbench/templates/_helpers.tpl @@ -109,6 +109,11 @@ containers: mountPath: "/mnt/configmap/rstudio/" - name: rstudio-session-config mountPath: "/mnt/session-configmap/rstudio/" + {{- if hasKey .Values.config.session "pip.conf" }} + - name: rstudio-session-config + mountPath: "/etc/pip.conf" + subPath: "pip.conf" + {{- end }} {{- if .Values.config.sessionSecret }} - name: rstudio-session-secret mountPath: {{ .Values.session.defaultSecretMountPath }} diff --git a/charts/rstudio-workbench/templates/configmap-general.yaml b/charts/rstudio-workbench/templates/configmap-general.yaml index f075756f..b9ded8fc 100644 --- a/charts/rstudio-workbench/templates/configmap-general.yaml +++ b/charts/rstudio-workbench/templates/configmap-general.yaml @@ -16,6 +16,11 @@ {{- $volumeList := append $sessionTemplate.pod.volumes $sessionVolume }} {{- $_ := set $sessionTemplate.pod "volumes" $volumeList }} {{- $volumeMountList := append $sessionTemplate.pod.volumeMounts $sessionVolumeMount }} + {{- if hasKey .Values.config.session "pip.conf" }} + {{- /* set the pip volume mount on sessions if necessary... */ -}} + {{- $pipVolumeMount := dict "mountPath" "/etc/pip.conf" "subPath" "pip.conf" "name" "session-config" }} + {{- $volumeMountList = append $volumeMountList $pipVolumeMount }} + {{- end }} {{- $_ := set $sessionTemplate.pod "volumeMounts" $volumeMountList }} {{- end }} {{- if .Values.config.sessionSecret}}