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.

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

Bump pwb 2024.12.0 #631

Merged
merged 3 commits into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions charts/rstudio-workbench/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: rstudio-workbench
description: Official Helm chart for Posit Workbench
version: 0.8.9
version: 0.8.10
apiVersion: v2
appVersion: 2024.09.1
appVersion: 2024.12.0
icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
home: https://www.rstudio.com
sources:
Expand All @@ -18,9 +18,9 @@ dependencies:
annotations:
artifacthub.io/images: |
- name: rstudio-workbench
image: rstudio/rstudio-workbench:ubuntu2204-2024.09.1
image: rstudio/rstudio-workbench:ubuntu2204-2024.12.0
- name: r-session-complete
image: rstudio/r-session-complete:ubuntu2204-2024.09.1
image: rstudio/r-session-complete:ubuntu2204-2024.12.0
artifacthub.io/license: MIT
artifacthub.io/links: |
- name: Docker Images
Expand Down
6 changes: 6 additions & 0 deletions charts/rstudio-workbench/NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 0.8.10

- Bump Workbench version to 2024.12.0
- Bump version of launcher templates `job.tpl` and `service.tpl`
- Populate pod `initContainers` from `.Job.initContainers`

## 0.8.9

- Fix a logic bug where the resource limit key was set even if `resources.limits.enabled` is false
Expand Down
6 changes: 3 additions & 3 deletions charts/rstudio-workbench/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Posit Workbench

![Version: 0.8.9](https://img.shields.io/badge/Version-0.8.9-informational?style=flat-square) ![AppVersion: 2024.09.1](https://img.shields.io/badge/AppVersion-2024.09.1-informational?style=flat-square)
![Version: 0.8.10](https://img.shields.io/badge/Version-0.8.10-informational?style=flat-square) ![AppVersion: 2024.12.0](https://img.shields.io/badge/AppVersion-2024.12.0-informational?style=flat-square)

#### _Official Helm chart for Posit Workbench_

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

```{.bash}
helm repo add rstudio https://helm.rstudio.com
helm upgrade --install my-release rstudio/rstudio-workbench --version=0.8.9
helm upgrade --install my-release rstudio/rstudio-workbench --version=0.8.10
```

To explore other chart versions, look at:
Expand Down
44 changes: 43 additions & 1 deletion charts/rstudio-workbench/files/job.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Version: 2.4.0
# Version: 2.5.0
# DO NOT MODIFY the "Version: " key
# Helm Version: v1
{{- $templateData := include "rstudio-library.templates.data" nil | mustFromJson }}
Expand Down Expand Up @@ -144,6 +144,48 @@ spec:
imagePullSecrets: {{ toYaml . | nindent 12 }}
{{- end }}
initContainers:
{{- with .Job.initContainers }}
{{- range . }}
- name: {{ toYaml .name }}
image: {{ toYaml .image }}
{{- $isShell := false }}
{{- if .command }}
command: ['/bin/sh']
{{- $isShell = true }}
{{- else if .exe }}
command: [{{ toYaml .exe }}]
{{- $isShell = false }}
{{- end }}
{{- if or .args $isShell }}
args:
{{- if $isShell }}
- '-c'
{{- if .args }}
- {{ .args | join " " | cat .command | toYaml | indent 12 | trimPrefix (repeat 12 " ") }}
{{- else }}
- {{ .command | toYaml | indent 12 | trimPrefix (repeat 12 " ") }}
{{- end }}
{{- else }}
{{- range .args }}
- {{ toYaml . | indent 12 | trimPrefix (repeat 12 " ") }}
{{- end }}
{{- end }}
{{- end }}
{{- if .environment }}
env:
{{- range .environment }}
- name: {{ toYaml .name | indent 14 | trimPrefix (repeat 14 " ") }}
value: {{ toYaml .value | indent 14 | trimPrefix (repeat 14 " ") }}
{{- end }}
{{- end }}
{{- if .mounts }}
volumeMounts:
{{- range .mounts }}
- {{ nindent 14 (toYaml .) | trim -}}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- with .Job.metadata.pod.initContainers }}
{{- range . }}
- {{ toYaml . | indent 10 | trimPrefix (repeat 10 " ") }}
Expand Down
2 changes: 1 addition & 1 deletion charts/rstudio-workbench/files/service.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Version: 2.4.0
# Version: 2.5.0
# DO NOT MODIFY the "Version: " key
# Helm Version: v1
{{- $templateData := include "rstudio-library.templates.data" nil | mustFromJson }}
Expand Down
18 changes: 16 additions & 2 deletions charts/rstudio-workbench/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -463,14 +463,28 @@ config:
default-session-cluster: Kubernetes
vscode.conf:
enabled: 1
exe: /opt/code-server/bin/code-server
args: --host=0.0.0.0
session-timeout-kill-hours: 12
melissa-barca marked this conversation as resolved.
Show resolved Hide resolved
vscode.extensions.conf: |
quarto.quarto
posit.shiny
posit.publisher
vscode-user-settings.json: |
{
"terminal.integrated.shell.linux": "/bin/bash",
"extensions.autoUpdate": false,
"extensions.autoCheckUpdates": false
}
# positron.conf:
# enabled: 1
# positron.extensions.conf: |
# posit.shiny
# posit.publisher
# positron-user-settings.json: |
# {
# "terminal.integrated.shell.linux": "/bin/bash",
# "extensions.autoUpdate": false,
# "extensions.autoCheckUpdates": false
# }
melissa-barca marked this conversation as resolved.
Show resolved Hide resolved
logging.conf:
"*":
log-level: info
Expand Down
Loading