From 076d0417e55c7a3093b5452d69c97e5d2ce97fec Mon Sep 17 00:00:00 2001 From: Patrick Schratz Date: Fri, 10 May 2024 15:24:37 +0200 Subject: [PATCH 1/4] Update prestart.bash --- charts/rstudio-connect/prestart.bash | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/rstudio-connect/prestart.bash b/charts/rstudio-connect/prestart.bash index dd464db2..13e2fa76 100644 --- a/charts/rstudio-connect/prestart.bash +++ b/charts/rstudio-connect/prestart.bash @@ -40,8 +40,13 @@ main() { /usr/local/share/ca-certificates/Kubernetes/cert-Kubernetes.crt 2>&1 | _indent _logf 'Updating CA certificates' - PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \ + PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin + DIST=$(cat /etc/os-release | grep "^ID=" -E -m 1 | cut -c 4-10 | sed 's/"//g') + if [[ $DIST == "ubuntu" ]]; then update-ca-certificates 2>&1 | _indent + elif [[ $DIST == "rhel" || $DIST == "almalinux" ]]; then + update-ca-trust 2>&1 | _indent + fi _logf 'Replacing process with %s' "${startup_script}" exec "${startup_script}" From 9287b9cc7ca08f1fb35c9446254375d8052ffee5 Mon Sep 17 00:00:00 2001 From: David Kegley Date: Tue, 21 Jan 2025 11:13:11 -0500 Subject: [PATCH 2/4] Bump chart version --- charts/rstudio-connect/Chart.yaml | 2 +- charts/rstudio-connect/NEWS.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/rstudio-connect/Chart.yaml b/charts/rstudio-connect/Chart.yaml index b9e4e5b1..3c31e5df 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 Posit Connect -version: 0.7.19 +version: 0.7.20 apiVersion: v2 appVersion: 2024.12.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 43c2d5a6..6735a1f1 100644 --- a/charts/rstudio-connect/NEWS.md +++ b/charts/rstudio-connect/NEWS.md @@ -1,5 +1,9 @@ # Changelog +## 0.7.20 + +- `prestart.bash` startup scripts now support RHEL + ## 0.7.19 - Allow overriding the default content Job resource requests/limits settings via the values file From 1d90221b2827abcb5334424171e3ccbafaa6a856 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 21 Jan 2025 16:18:44 +0000 Subject: [PATCH 3/4] Update helm-docs and README.md --- charts/rstudio-connect/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/rstudio-connect/README.md b/charts/rstudio-connect/README.md index 9aedbcc4..97b5dad8 100644 --- a/charts/rstudio-connect/README.md +++ b/charts/rstudio-connect/README.md @@ -1,6 +1,6 @@ # Posit Connect -![Version: 0.7.19](https://img.shields.io/badge/Version-0.7.19-informational?style=flat-square) ![AppVersion: 2024.12.0](https://img.shields.io/badge/AppVersion-2024.12.0-informational?style=flat-square) +![Version: 0.7.20](https://img.shields.io/badge/Version-0.7.20-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 Connect_ @@ -30,11 +30,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.7.19: +To install the chart with the release name `my-release` at version 0.7.20: ```{.bash} helm repo add rstudio https://helm.rstudio.com -helm upgrade --install my-release rstudio/rstudio-connect --version=0.7.19 +helm upgrade --install my-release rstudio/rstudio-connect --version=0.7.20 ``` To explore other chart versions, look at: From 9275ccf9e7ea8980f3366ccdedccfb103bc0f96e Mon Sep 17 00:00:00 2001 From: David Kegley Date: Tue, 21 Jan 2025 12:00:16 -0500 Subject: [PATCH 4/4] Add rockylinux to allowed OS types for prestart.bash --- charts/rstudio-connect/prestart.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rstudio-connect/prestart.bash b/charts/rstudio-connect/prestart.bash index 13e2fa76..bf8b42b2 100644 --- a/charts/rstudio-connect/prestart.bash +++ b/charts/rstudio-connect/prestart.bash @@ -44,7 +44,7 @@ main() { DIST=$(cat /etc/os-release | grep "^ID=" -E -m 1 | cut -c 4-10 | sed 's/"//g') if [[ $DIST == "ubuntu" ]]; then update-ca-certificates 2>&1 | _indent - elif [[ $DIST == "rhel" || $DIST == "almalinux" ]]; then + elif [[ $DIST == "rhel" || $DIST == "almalinux" || $DIST == "rocky" ]]; then update-ca-trust 2>&1 | _indent fi