Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into add-pip
Browse files Browse the repository at this point in the history
  • Loading branch information
colearendt committed Aug 23, 2023
2 parents ba07365 + 666e86d commit 55602bb
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @colearendt @atheriel

# package-manager resources
/charts/rstudio-pm/* @rstudio/rspm-dev
/charts/rstudio-pm/* @rstudio/ppm

# connect resources
/charts/rstudio-connect/* @aronatkins @dbkegley @christierney @zackverham
Expand Down
4 changes: 2 additions & 2 deletions charts/rstudio-pm/Chart.yaml
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
version: 0.5.13
apiVersion: v2
appVersion: 2023.04.0
icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
Expand All @@ -19,7 +19,7 @@ dependencies:
annotations:
artifacthub.io/images: |
- name: rstudio-package-manager
image: rstudio/rstudio-package-manager:bionic-2023.04.0
image: rstudio/rstudio-package-manager:ubuntu2204-2023.04.0
artifacthub.io/license: MIT
artifacthub.io/links: |
- name: RStudio Community
Expand Down
9 changes: 9 additions & 0 deletions charts/rstudio-pm/NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# 0.5.13

- Change default operating system from `bionic` to `ubuntu2204` (`jammy`)
- This is not a breaking change since it does not affect how Package Manager serves packages

# 0.5.12

- Add values for `serviceAccount.labels`

# 0.5.11

- Add `topologySpreadConstraints` values
Expand Down
8 changes: 4 additions & 4 deletions charts/rstudio-pm/README.md
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 @@ -131,7 +131,7 @@ The Helm `config` values are converted into the `rstudio-pm.gcfg` service config
| image.imagePullSecrets | list | `[]` | an array of kubernetes secrets for pulling the main pod image from private registries |
| image.repository | string | `"rstudio/rstudio-package-manager"` | the repository to use for the main pod image |
| image.tag | string | `""` | the tag to use for the main pod image |
| image.tagPrefix | string | `"bionic-"` | A tag prefix for the server image (common selections: bionic-, jammy-). Only used if tag is not defined |
| image.tagPrefix | string | `"ubuntu2204-"` | A tag prefix for the server image (common selection: ubuntu2204-). Only used if tag is not defined |
| ingress.annotations | object | `{}` | |
| ingress.enabled | bool | `false` | |
| ingress.hosts | string | `nil` | |
Expand Down
4 changes: 2 additions & 2 deletions charts/rstudio-pm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ sharedStorage:
image:
# -- the repository to use for the main pod image
repository: rstudio/rstudio-package-manager
# -- A tag prefix for the server image (common selections: bionic-, jammy-). Only used if tag is not defined
tagPrefix: bionic-
# -- A tag prefix for the server image (common selection: ubuntu2204-). Only used if tag is not defined
tagPrefix: ubuntu2204-
# -- the tag to use for the main pod image
tag: ""
# -- the imagePullPolicy for the main pod image
Expand Down
8 changes: 4 additions & 4 deletions charts/rstudio-workbench/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: rstudio-workbench
description: Official Helm chart for RStudio Workbench
version: 0.6.6
version: 0.6.7
apiVersion: v2
appVersion: 2023.06.0
appVersion: 2023.06.1
icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
home: https://www.rstudio.com
sources:
Expand All @@ -18,9 +18,9 @@ dependencies:
annotations:
artifacthub.io/images: |
- name: rstudio-workbench
image: rstudio/rstudio-workbench:ubuntu2204-2023.06.0
image: rstudio/rstudio-workbench:ubuntu2204-2023.06.1
- name: r-session-complete
image: rstudio/r-session-complete:ubuntu2204-2023.06.0
image: rstudio/r-session-complete:ubuntu2204-2023.06.1
artifacthub.io/license: MIT
artifacthub.io/links: |
- name: Docker Images
Expand Down
8 changes: 6 additions & 2 deletions charts/rstudio-workbench/NEWS.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
# 0.6.6
# 0.6.7

- Add native session support for `pip.conf`
- In order to mount a `pip.conf` file to `/etc/pip.conf` on server and sessions,
just define the file in `config.session.pip\\.conf`

# 0.6.6

- Bump Workbench version to 2023.06.1

# 0.6.5

- Add support for `homeStorage.subPath` (and for launcher sessions)
Expand All @@ -22,7 +26,7 @@

# 0.6.1

- Bump Workbench version to 2023.06
- Bump Workbench version to 2023.06.0

# 0.6.0

Expand Down
6 changes: 3 additions & 3 deletions charts/rstudio-workbench/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# RStudio Workbench

![Version: 0.6.6](https://img.shields.io/badge/Version-0.6.6-informational?style=flat-square) ![AppVersion: 2023.06.0](https://img.shields.io/badge/AppVersion-2023.06.0-informational?style=flat-square)
![Version: 0.6.7](https://img.shields.io/badge/Version-0.6.7-informational?style=flat-square) ![AppVersion: 2023.06.1](https://img.shields.io/badge/AppVersion-2023.06.1-informational?style=flat-square)

#### _Official Helm chart for RStudio Workbench_

Expand All @@ -27,11 +27,11 @@ To ensure a stable production deployment, please:

## Installing the Chart

To install the chart with the release name `my-release` at version 0.6.6:
To install the chart with the release name `my-release` at version 0.6.7:

```bash
helm repo add rstudio https://helm.rstudio.com
helm upgrade --install my-release rstudio/rstudio-workbench --version=0.6.6
helm upgrade --install my-release rstudio/rstudio-workbench --version=0.6.7
```

To explore other chart versions, take a look at:
Expand Down

0 comments on commit 55602bb

Please sign in to comment.