Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add pip.conf mount to /etc/pip.conf #407

Merged
merged 2 commits into from
Aug 31, 2023
Merged

add pip.conf mount to /etc/pip.conf #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba07365
add pip.conf mount to /etc/pip.conf
colearendt Aug 14, 2023
55602bb
Merge remote-tracking branch 'origin/main' into add-pip
colearendt Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/rstudio-workbench/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: rstudio-workbench
description: Official Helm chart for RStudio Workbench
version: 0.6.6
version: 0.6.7
apiVersion: v2
appVersion: 2023.06.1
icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
Expand Down
8 changes: 7 additions & 1 deletion charts/rstudio-workbench/NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
# 0.6.7

- 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.6

- Bump Workbench version to 2023.06.1
-

# 0.6.5

- Add support for `homeStorage.subPath` (and for launcher sessions)
Expand Down
6 changes: 3 additions & 3 deletions charts/rstudio-workbench/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# RStudio Workbench

![Version: 0.6.6](https://img.shields.io/badge/Version-0.6.6-informational?style=flat-square) ![AppVersion: 2023.06.1](https://img.shields.io/badge/AppVersion-2023.06.1-informational?style=flat-square)
![Version: 0.6.7](https://img.shields.io/badge/Version-0.6.7-informational?style=flat-square) ![AppVersion: 2023.06.1](https://img.shields.io/badge/AppVersion-2023.06.1-informational?style=flat-square)

#### _Official Helm chart for RStudio Workbench_

Expand All @@ -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.6:
To install the chart with the release name `my-release` at version 0.6.7:

```bash
helm repo add rstudio https://helm.rstudio.com
helm upgrade --install my-release rstudio/rstudio-workbench --version=0.6.6
helm upgrade --install my-release rstudio/rstudio-workbench --version=0.6.7
```

To explore other chart versions, take a look at:
Expand Down
5 changes: 5 additions & 0 deletions charts/rstudio-workbench/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
5 changes: 5 additions & 0 deletions charts/rstudio-workbench/templates/configmap-general.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
Loading