Skip to content

Add support for RHEL in Connect's prestart.bash #639

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.

Sign up for GitHub

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

Merged
dbkegley merged 5 commits into from
Jan 21, 2025
Merged

Add support for RHEL in Connect's prestart.bash #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
076d041
Update prestart.bash
pat-s May 10, 2024
9287b9c
Bump chart version
dbkegley Jan 21, 2025
1d90221
Update helm-docs and README.md
actions-user Jan 21, 2025
9275ccf
Add rockylinux to allowed OS types for prestart.bash
dbkegley Jan 21, 2025
7aabbdc
Merge branch 'kegs/rhel-startup-script' of github.com:rstudio/helm in…
dbkegley Jan 21, 2025
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
2 changes: 1 addition & 1 deletion charts/rstudio-connect/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 4 additions & 0 deletions charts/rstudio-connect/NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions charts/rstudio-connect/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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_

Expand Down Expand Up @@ -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:
Expand Down
7 changes: 6 additions & 1 deletion charts/rstudio-connect/prestart.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
Loading