Merge pull request #639 from rstudio/kegs/rhel-startup-script

Add support for RHEL in Connect's prestart.bash
rstudio · Jan 21, 2025 · 775b1e1 · 775b1e1
2 parents 6ac3842 + 7aabbdc
commit 775b1e1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git 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
@@ -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

diff --git 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:

diff --git 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" || $DIST == "rocky" ]]; then
+    update-ca-trust 2>&1 | _indent
+  fi
 
   _logf 'Replacing process with %s' "${startup_script}"
   exec "${startup_script}"