From dc956f201f2e8c97a61d2b6e5f771c547b440224 Mon Sep 17 00:00:00 2001 From: SamEdwardes Date: Fri, 1 Mar 2024 14:40:19 -0800 Subject: [PATCH 1/6] Set default for `config.Server.RVersion` and `config.Server.PythonVersion` to `""` --- charts/rstudio-pm/Chart.yaml | 2 +- charts/rstudio-pm/NEWS.md | 7 ++++++- charts/rstudio-pm/values.yaml | 5 ++++- charts/rstudio-workbench/test-values.yaml | 17 +++++++++++++++++ 4 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 charts/rstudio-workbench/test-values.yaml diff --git a/charts/rstudio-pm/Chart.yaml b/charts/rstudio-pm/Chart.yaml index 299b90a5..0df9b410 100644 --- a/charts/rstudio-pm/Chart.yaml +++ b/charts/rstudio-pm/Chart.yaml @@ -1,6 +1,6 @@ name: rstudio-pm description: Official Helm chart for RStudio Package Manager -version: 0.5.19 +version: 0.5.20 apiVersion: v2 appVersion: 2023.12.0 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png diff --git a/charts/rstudio-pm/NEWS.md b/charts/rstudio-pm/NEWS.md index fedda21e..dc4d32f3 100644 --- a/charts/rstudio-pm/NEWS.md +++ b/charts/rstudio-pm/NEWS.md @@ -1,3 +1,8 @@ +# 0.5.20 + +- Configured the default value of `config.Server.RVersion` to `""` so that R version auto-detection will be used ([#473](https://github.com/rstudio/helm/issues/473)). +- Configured the default value of `config.Server.PythonVersion` to `""` so that R version auto-detection will be used ([#473](https://github.com/rstudio/helm/issues/473)). + # 0.5.19 - Add option to set `pod.terminationGracePeriodSeconds` @@ -23,7 +28,7 @@ - Update default Posit Package Manager version to 2023.08.0-16 -# 0.5.13 +# 0.5.13 - Change default operating system from `bionic` to `ubuntu2204` (`jammy`) - This is not a breaking change since it does not affect how Package Manager serves packages diff --git a/charts/rstudio-pm/values.yaml b/charts/rstudio-pm/values.yaml index 6034f21e..9b875b0b 100644 --- a/charts/rstudio-pm/values.yaml +++ b/charts/rstudio-pm/values.yaml @@ -232,7 +232,10 @@ serviceMonitor: # -- config is a nested map of maps that generates the rstudio-pm.gcfg file config: Server: - RVersion: "/opt/R/3.6.2/" + # An empty string will configure Package Manager to autodetect R + RVersion: "" + # An empty string will configure Package Manager to autodetect Python + PythonVersion: "" HTTP: Listen: :4242 Metrics: diff --git a/charts/rstudio-workbench/test-values.yaml b/charts/rstudio-workbench/test-values.yaml new file mode 100644 index 00000000..60d85029 --- /dev/null +++ b/charts/rstudio-workbench/test-values.yaml @@ -0,0 +1,17 @@ +# Configures user home directory shared storage +homeStorage: + create: true + mount: true + storageClassName: efs-client + requests: + storage: 8G + +# Configures Workbench shared storage +sharedStorage: + create: true + mount: true + storageClassName: efs-client + requests: + storage: 1G + +userCreate: true \ No newline at end of file From 4e5775ea94075f1e5a9b68184fd00eb31afbc5ef Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 1 Mar 2024 22:45:32 +0000 Subject: [PATCH 2/6] Update helm-docs and README.md --- charts/rstudio-pm/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/rstudio-pm/README.md b/charts/rstudio-pm/README.md index 02aebd21..225a89b8 100644 --- a/charts/rstudio-pm/README.md +++ b/charts/rstudio-pm/README.md @@ -1,6 +1,6 @@ # RStudio Package Manager -![Version: 0.5.19](https://img.shields.io/badge/Version-0.5.19-informational?style=flat-square) ![AppVersion: 2023.12.0](https://img.shields.io/badge/AppVersion-2023.12.0-informational?style=flat-square) +![Version: 0.5.20](https://img.shields.io/badge/Version-0.5.20-informational?style=flat-square) ![AppVersion: 2023.12.0](https://img.shields.io/badge/AppVersion-2023.12.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.19: +To install the chart with the release name `my-release` at version 0.5.20: ```bash helm repo add rstudio https://helm.rstudio.com -helm upgrade --install my-release rstudio/rstudio-pm --version=0.5.19 +helm upgrade --install my-release rstudio/rstudio-pm --version=0.5.20 ``` To explore other chart versions, take a look at: @@ -154,7 +154,7 @@ The Helm `config` values are converted into the `rstudio-pm.gcfg` service config | awsAccessKeyId | bool | `false` | awsAccessKeyId is the access key id for s3 access, used also to gate file creation | | awsSecretAccessKey | string | `nil` | awsSecretAccessKey is the secret access key, needs to be filled if access_key_id is | | command | bool | `false` | command is the pod's run command. By default, it uses the container's default | -| config | object | `{"HTTP":{"Listen":":4242"},"Metrics":{"Enabled":true},"Server":{"RVersion":"/opt/R/3.6.2/"}}` | config is a nested map of maps that generates the rstudio-pm.gcfg file | +| config | object | `{"HTTP":{"Listen":":4242"},"Metrics":{"Enabled":true},"Server":{"PythonVersion":"","RVersion":""}}` | config is a nested map of maps that generates the rstudio-pm.gcfg file | | enableMigration | bool | `true` | Enable migrations for shared storage (if necessary) using Helm hooks. | | enableSandboxing | bool | `true` | Enable sandboxing of Git builds, which requires elevated security privileges for the Package Manager container. | | extraContainers | list | `[]` | sidecar container list | From 49af68dbb54cac9017b7ba32ed6f2a3c20cf5dec Mon Sep 17 00:00:00 2001 From: SamEdwardes Date: Wed, 6 Mar 2024 14:52:28 -0800 Subject: [PATCH 3/6] Remove R and Python from PPM config --- charts/rstudio-pm/values.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/charts/rstudio-pm/values.yaml b/charts/rstudio-pm/values.yaml index 9b875b0b..7af378b6 100644 --- a/charts/rstudio-pm/values.yaml +++ b/charts/rstudio-pm/values.yaml @@ -232,10 +232,7 @@ serviceMonitor: # -- config is a nested map of maps that generates the rstudio-pm.gcfg file config: Server: - # An empty string will configure Package Manager to autodetect R - RVersion: "" - # An empty string will configure Package Manager to autodetect Python - PythonVersion: "" + Address: http://localhost:4242 HTTP: Listen: :4242 Metrics: From 8f7fb316c08e2d42be9dabe045ead2547d34d9c7 Mon Sep 17 00:00:00 2001 From: SamEdwardes Date: Wed, 6 Mar 2024 14:52:55 -0800 Subject: [PATCH 4/6] Delete the test values I committed by mistake --- charts/rstudio-workbench/test-values.yaml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 charts/rstudio-workbench/test-values.yaml diff --git a/charts/rstudio-workbench/test-values.yaml b/charts/rstudio-workbench/test-values.yaml deleted file mode 100644 index 60d85029..00000000 --- a/charts/rstudio-workbench/test-values.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# Configures user home directory shared storage -homeStorage: - create: true - mount: true - storageClassName: efs-client - requests: - storage: 8G - -# Configures Workbench shared storage -sharedStorage: - create: true - mount: true - storageClassName: efs-client - requests: - storage: 1G - -userCreate: true \ No newline at end of file From 9e51675594b9de934f0fc5caae659fd6531187ed Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 6 Mar 2024 22:53:22 +0000 Subject: [PATCH 5/6] Update helm-docs and README.md --- charts/rstudio-pm/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rstudio-pm/README.md b/charts/rstudio-pm/README.md index 225a89b8..f328086c 100644 --- a/charts/rstudio-pm/README.md +++ b/charts/rstudio-pm/README.md @@ -154,7 +154,7 @@ The Helm `config` values are converted into the `rstudio-pm.gcfg` service config | awsAccessKeyId | bool | `false` | awsAccessKeyId is the access key id for s3 access, used also to gate file creation | | awsSecretAccessKey | string | `nil` | awsSecretAccessKey is the secret access key, needs to be filled if access_key_id is | | command | bool | `false` | command is the pod's run command. By default, it uses the container's default | -| config | object | `{"HTTP":{"Listen":":4242"},"Metrics":{"Enabled":true},"Server":{"PythonVersion":"","RVersion":""}}` | config is a nested map of maps that generates the rstudio-pm.gcfg file | +| config | object | `{"HTTP":{"Listen":":4242"},"Metrics":{"Enabled":true},"Server":{"Address":"http://localhost:4242"}}` | config is a nested map of maps that generates the rstudio-pm.gcfg file | | enableMigration | bool | `true` | Enable migrations for shared storage (if necessary) using Helm hooks. | | enableSandboxing | bool | `true` | Enable sandboxing of Git builds, which requires elevated security privileges for the Package Manager container. | | extraContainers | list | `[]` | sidecar container list | From 7a23de5c3014998746aeb30aa079520d2b4c8f5d Mon Sep 17 00:00:00 2001 From: SamEdwardes Date: Wed, 6 Mar 2024 14:56:00 -0800 Subject: [PATCH 6/6] Update NEWS.md --- charts/rstudio-pm/NEWS.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/rstudio-pm/NEWS.md b/charts/rstudio-pm/NEWS.md index dc4d32f3..0adce82f 100644 --- a/charts/rstudio-pm/NEWS.md +++ b/charts/rstudio-pm/NEWS.md @@ -1,7 +1,6 @@ # 0.5.20 -- Configured the default value of `config.Server.RVersion` to `""` so that R version auto-detection will be used ([#473](https://github.com/rstudio/helm/issues/473)). -- Configured the default value of `config.Server.PythonVersion` to `""` so that R version auto-detection will be used ([#473](https://github.com/rstudio/helm/issues/473)). +- Removed`config.Server.RVersion` from the values.yaml. This does not need to be configured, R version auto-detection will be used ([#473](https://github.com/rstudio/helm/issues/473)). # 0.5.19