From 673998174136b52aaf4927b8d7126b591e482370 Mon Sep 17 00:00:00 2001 From: Michael Thomson Date: Wed, 20 Sep 2023 13:16:55 -0500 Subject: [PATCH 1/3] remove CRAN override from Connect chart value --- charts/rstudio-connect/values.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/charts/rstudio-connect/values.yaml b/charts/rstudio-connect/values.yaml index efefe3e3..bc4922ff 100644 --- a/charts/rstudio-connect/values.yaml +++ b/charts/rstudio-connect/values.yaml @@ -317,8 +317,6 @@ config: Listen: :3939 Authentication: Provider: password - 'RPackageRepository "CRAN"': - URL: https://packagemanager.rstudio.com/cran/__linux__/jammy/latest 'RPackageRepository "RSPM"': URL: https://packagemanager.rstudio.com/cran/__linux__/jammy/latest Server: From 62986fec46e08aa7f06f2f75ac3cabc6b2ee8b03 Mon Sep 17 00:00:00 2001 From: Michael Thomson Date: Wed, 20 Sep 2023 13:28:48 -0500 Subject: [PATCH 2/3] remove more references --- charts/rstudio-connect/ci/complex-values.yaml | 4 +--- charts/rstudio-connect/ci/simple-values.yaml | 4 +--- examples/connect/beta-migration/values-base.yaml | 5 ----- examples/connect/beta-migration/values-pro.yaml | 5 ----- examples/connect/standalone/values.yaml | 4 +--- 5 files changed, 3 insertions(+), 19 deletions(-) diff --git a/charts/rstudio-connect/ci/complex-values.yaml b/charts/rstudio-connect/ci/complex-values.yaml index 37f77cd8..1adbede2 100644 --- a/charts/rstudio-connect/ci/complex-values.yaml +++ b/charts/rstudio-connect/ci/complex-values.yaml @@ -138,10 +138,8 @@ config: Python: Enabled: true Executable: /opt/python/3.6.5/bin/python - 'RPackageRepository "CRAN"': - URL: https://packagemanager.rstudio.com/cran/__linux__/bionic/latest 'RPackageRepository "RSPM"': - URL: https://packagemanager.rstudio.com/cran/__linux__/bionic/latest + URL: https://packagemanager.rstudio.com/cran/__linux__/jammy/latest Server: Address: http://localhost:3939 DataDir: /var/lib/rstudio-connect diff --git a/charts/rstudio-connect/ci/simple-values.yaml b/charts/rstudio-connect/ci/simple-values.yaml index 0d8cacb2..05c0f4e6 100644 --- a/charts/rstudio-connect/ci/simple-values.yaml +++ b/charts/rstudio-connect/ci/simple-values.yaml @@ -14,10 +14,8 @@ config: Python: Enabled: true Executable: /opt/python/3.6.5/bin/python - 'RPackageRepository "CRAN"': - URL: https://packagemanager.rstudio.com/cran/__linux__/bionic/latest 'RPackageRepository "RSPM"': - URL: https://packagemanager.rstudio.com/cran/__linux__/bionic/latest + URL: https://packagemanager.rstudio.com/cran/__linux__/jammy/latest Server: Address: http://localhost:3939 DataDir: /var/lib/rstudio-connect diff --git a/examples/connect/beta-migration/values-base.yaml b/examples/connect/beta-migration/values-base.yaml index 7300dbca..0b8650e3 100644 --- a/examples/connect/beta-migration/values-base.yaml +++ b/examples/connect/beta-migration/values-base.yaml @@ -2,11 +2,6 @@ # @default -- [RStudio Connect Configuration Reference](https://docs.rstudio.com/connect/admin/appendix/configuration/) config: - # Overrides the package URLs to use source packages which are required if the list - # of execution environments contains multiple OS distributions. - 'RPackageRepository "CRAN"': - URL: https://packagemanager.rstudio.com/cran/latest - # Overrides the package URLs to use source packages which are required if the list # of execution environments contains multiple OS distributions. 'RPackageRepository "RSPM"': diff --git a/examples/connect/beta-migration/values-pro.yaml b/examples/connect/beta-migration/values-pro.yaml index 060aabd1..2d9cfd61 100644 --- a/examples/connect/beta-migration/values-pro.yaml +++ b/examples/connect/beta-migration/values-pro.yaml @@ -2,11 +2,6 @@ # @default -- [RStudio Connect Configuration Reference](https://docs.rstudio.com/connect/admin/appendix/configuration/) config: - # Overrides the package URLs to use source packages which are required if the list - # of execution environments contains multiple OS distributions. - 'RPackageRepository "CRAN"': - URL: https://packagemanager.rstudio.com/cran/latest - # Overrides the package URLs to use source packages which are required if the list # of execution environments contains multiple OS distributions. 'RPackageRepository "RSPM"': diff --git a/examples/connect/standalone/values.yaml b/examples/connect/standalone/values.yaml index fed5f654..646e2c8b 100644 --- a/examples/connect/standalone/values.yaml +++ b/examples/connect/standalone/values.yaml @@ -24,9 +24,7 @@ config: Enabled: true Executable: - /opt/python/3.9.5/bin/python - 'RPackageRepository "CRAN"': - URL: https://packagemanager.rstudio.com/cran/__linux__/bionic/latest 'RPackageRepository "RSPM"': - URL: https://packagemanager.rstudio.com/cran/__linux__/bionic/latest + URL: https://packagemanager.rstudio.com/cran/__linux__/jammy/latest Server: DefaultContentListView: expanded From 85794b4876330bcba00c2d39a173906f6d6ba4cd Mon Sep 17 00:00:00 2001 From: Michael Thomson Date: Fri, 22 Sep 2023 13:42:31 -0700 Subject: [PATCH 3/3] add news entry and bump chart version --- charts/rstudio-connect/Chart.yaml | 2 +- charts/rstudio-connect/NEWS.md | 4 ++++ charts/rstudio-connect/README.md | 6 +++--- charts/rstudio-workbench/NEWS.md | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/charts/rstudio-connect/Chart.yaml b/charts/rstudio-connect/Chart.yaml index 07484733..a449462e 100644 --- a/charts/rstudio-connect/Chart.yaml +++ b/charts/rstudio-connect/Chart.yaml @@ -1,6 +1,6 @@ name: rstudio-connect description: Official Helm chart for RStudio Connect -version: 0.5.6 +version: 0.5.7 apiVersion: v2 appVersion: 2023.09.0 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png diff --git a/charts/rstudio-connect/NEWS.md b/charts/rstudio-connect/NEWS.md index b7a4b385..2caa66ed 100644 --- a/charts/rstudio-connect/NEWS.md +++ b/charts/rstudio-connect/NEWS.md @@ -1,3 +1,7 @@ +# 0.5.7 + +- Remove `CRAN` as a default repository entry in `session.repos.conf` + # 0.5.6 - Bump Connect version to 2023.09.0 diff --git a/charts/rstudio-connect/README.md b/charts/rstudio-connect/README.md index 0ec9e04a..436bc46e 100644 --- a/charts/rstudio-connect/README.md +++ b/charts/rstudio-connect/README.md @@ -1,6 +1,6 @@ # RStudio Connect -![Version: 0.5.6](https://img.shields.io/badge/Version-0.5.6-informational?style=flat-square) ![AppVersion: 2023.09.0](https://img.shields.io/badge/AppVersion-2023.09.0-informational?style=flat-square) +![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) #### _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.6: +To install the chart with the release name `my-release` at version 0.5.7: ```bash helm repo add rstudio https://helm.rstudio.com -helm upgrade --install my-release rstudio/rstudio-connect --version=0.5.6 +helm upgrade --install my-release rstudio/rstudio-connect --version=0.5.7 ``` To explore other chart versions, take a look at: diff --git a/charts/rstudio-workbench/NEWS.md b/charts/rstudio-workbench/NEWS.md index 3bc71a22..1dc420f8 100644 --- a/charts/rstudio-workbench/NEWS.md +++ b/charts/rstudio-workbench/NEWS.md @@ -52,6 +52,7 @@ - Add `podDisruptionBudget` values - Add `topologySpreadConstraints` values - Start to utilize the `pod.securityContext` values for pod `securityContext` values +- Remove `CRAN` as a default repository entry in `session.repos.conf` # 0.5.32