Skip to content
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

Jump to bottom

Use R and Python image default paths #402

Closed
wants to merge 5 commits into from
Closed

Use R and Python image default paths #402

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
c4e1c2f
Update rstudio-pm chart to use /opt/R/default for the R path
ianpittwood Jul 31, 2023
d56d602
Update rstudio-connect ci Python and R paths
ianpittwood Jul 31, 2023
d0eb9da
Bump bugfix version instead of minor revision version
ianpittwood Aug 1, 2023
29d081c
Revert "Update rstudio-connect ci Python and R paths"
ianpittwood Aug 1, 2023
549ee51
update NEWS.md version
ianpittwood Aug 14, 2023
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-pm/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: rstudio-pm
description: Official Helm chart for RStudio Package Manager
version: 0.5.12
ianpittwood marked this conversation as resolved.
Show resolved Hide resolved
version: 0.5.13
apiVersion: v2
appVersion: 2023.04.0
icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
Expand Down
4 changes: 4 additions & 0 deletions charts/rstudio-pm/NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 0.5.13

- Change R path to `/opt/R/default`, a generic symlink to the primary R version in the image.

# 0.5.11

- Add `topologySpreadConstraints` values
Expand Down
8 changes: 4 additions & 4 deletions charts/rstudio-pm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# RStudio Package Manager

![Version: 0.5.12](https://img.shields.io/badge/Version-0.5.12-informational?style=flat-square) ![AppVersion: 2023.04.0](https://img.shields.io/badge/AppVersion-2023.04.0-informational?style=flat-square)
![Version: 0.5.13](https://img.shields.io/badge/Version-0.5.13-informational?style=flat-square) ![AppVersion: 2023.04.0](https://img.shields.io/badge/AppVersion-2023.04.0-informational?style=flat-square)

#### _Official Helm chart for RStudio Package Manager_

Expand All @@ -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.12:
To install the chart with the release name `my-release` at version 0.5.13:

```bash
helm repo add rstudio https://helm.rstudio.com
helm upgrade --install my-release rstudio/rstudio-pm --version=0.5.12
helm upgrade --install my-release rstudio/rstudio-pm --version=0.5.13
```

To explore other chart versions, take a look at:
Expand Down Expand Up @@ -121,7 +121,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":{"RVersion":"/opt/R/default/"}}` | 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 |
Expand Down
2 changes: 1 addition & 1 deletion charts/rstudio-pm/ci/all-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ config:
Server:
DataDir: /var/lib/rstudio-pm
RVersion:
- /opt/R/3.6.2
- /opt/R/default
Git:
BuilderDir: "/tmp/git"
rstudioPMKey: somevalue
Expand Down
2 changes: 1 addition & 1 deletion charts/rstudio-pm/ci/simple-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ config:
Server:
DataDir: /var/lib/rstudio-pm
RVersion:
- /opt/R/3.6.2
- /opt/R/default
Git:
BuilderDir: "/tmp/git"
2 changes: 1 addition & 1 deletion charts/rstudio-pm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ serviceMonitor:
# -- config is a nested map of maps that generates the rstudio-pm.gcfg file
config:
Server:
RVersion: "/opt/R/3.6.2/"
RVersion: "/opt/R/default/"
HTTP:
Listen: :4242
Metrics:
Expand Down
Loading