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.

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

Pull in a few misc PRs #457

Merged
merged 31 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ef03bcf
add terminationGracePeriodSeconds option
colearendt Sep 1, 2023
cc234bb
Update helm-docs and README.md
actions-user Sep 1, 2023
ed1fdee
update licenses, add chart keyword and update descriptions
AlexMapley Dec 5, 2023
f418408
Update helm-docs and README.md
actions-user Dec 5, 2023
1aace3a
update chronicle-agent examples, add ci for workbench and connect wit…
AlexMapley Dec 7, 2023
9225873
Update helm-docs and README.md
actions-user Dec 7, 2023
a34845d
Merge branch 'main' into rstudio_posit_partial_migration
AlexMapley Dec 12, 2023
869923b
RStudio - Posit
wydsith Dec 18, 2023
775433e
Update helm-docs and README.md
actions-user Dec 18, 2023
53ecd77
Merge branch 'main' into chronicle_agent_examples
AlexMapley Dec 19, 2023
3e5e03e
Merge branch 'main' into rstudio_posit_partial_migration
AlexMapley Dec 19, 2023
14704a3
Update prestart-launcher.bash
pat-s Jan 9, 2024
94a0771
Merge branch 'main' into chronicle_agent_examples
AlexMapley Jan 17, 2024
cfffcbf
Merge branch 'main' into rstudio_posit_partial_migration
AlexMapley Jan 18, 2024
ef7db62
simplify values and ci updates
Jan 18, 2024
800a6aa
Update helm-docs and README.md
actions-user Jan 18, 2024
c7fb288
Merge remote-tracking branch 'origin/add-term-grace' into dev
colearendt Jan 24, 2024
d1308f5
bump versions and update docs
colearendt Jan 24, 2024
df3a47a
Merge remote-tracking branch 'origin/ak_rstudio-positrebrand' into dev
colearendt Jan 24, 2024
5efc1b5
Merge remote-tracking branch 'origin/rstudio_posit_partial_migration'…
colearendt Jan 24, 2024
95b4d64
Merge remote-tracking branch 'origin/chronicle_agent_examples' into dev
colearendt Jan 24, 2024
c5c662c
Merge branch 'patch-2' into dev
colearendt Jan 24, 2024
ea21aac
ensure terminationGracePeriodSeconds is always set (with simpler temp…
colearendt Jan 24, 2024
eeaa713
add prestart-launcher.bash to NEWS.md
colearendt Jan 24, 2024
78076d5
Update helm-docs and README.md
actions-user Jan 24, 2024
16b16d3
update docs and a few more versions
colearendt Jan 24, 2024
3a93d1a
update lockfile
colearendt Jan 24, 2024
c6246d6
Update rbac yaml
actions-user Jan 24, 2024
868da6f
close #440
colearendt Jan 24, 2024
609324b
Merge remote-tracking branch 'origin/dev' into dev
colearendt Jan 24, 2024
d4600c6
Merge remote-tracking branch 'origin/main' into dev
colearendt Feb 13, 2024
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 LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021 RStudio, PBC
Copyright (c) 2023 Posit Software, PBC

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@

Individual helm charts have their own documentation

- [RStudio Connect](./charts/rstudio-connect)
- [RStudio Workbench](./charts/rstudio-workbench)
- [Posit Connect](./charts/rstudio-connect)
- [Posit Workbench](./charts/rstudio-workbench)
- [Posit Package Manager](./charts/rstudio-pm)

Examples:

- [All Examples](./examples)
- [RStudio Connect](./examples/connect/)
- [Posit Connect](./examples/connect/)
- [Standalone RBAC for the Job Launcher](./examples/rbac)

### Other Charts
Expand All @@ -46,7 +46,7 @@ Supporting and miscellaneous charts with varying levels of maintenance, usefulne

**IMPORTANT:**

These charts are provided as a convenience to RStudio customers. If you have
These charts are provided as a convenience to Posit customers. If you have
questions about these charts, you can ask them in the
[issues](https://github.com/rstudio/helm/issues/new/choose) in the repository
or to your support representative, who will route them appropriately.
Expand Down
2 changes: 1 addition & 1 deletion charts/posit-chronicle/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: posit-chronicle
description: Official Helm chart for Posit Chronicle Server
version: 0.2.0
version: 0.2.1
appVersion: 2023.11.3
icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
home: https://www.posit.co
Expand Down
8 changes: 8 additions & 0 deletions charts/posit-chronicle/NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
# 0.2.1

- Update docs

# 0.2.0

- Add values for `pod.terminationGracePeriodSeconds` and default `image.imagePullPolicy` = `IfNotPresent`

# 0.1.0

- Initial public release and integration into Posit's Helm repository. Includes
Expand Down
31 changes: 18 additions & 13 deletions charts/posit-chronicle/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Posit Chronicle

![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![AppVersion: 2023.11.3](https://img.shields.io/badge/AppVersion-2023.11.3-informational?style=flat-square)
![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![AppVersion: 2023.11.3](https://img.shields.io/badge/AppVersion-2023.11.3-informational?style=flat-square)

#### _Official Helm chart for Posit Chronicle Server_

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

## Installing the Chart

To install the chart with the release name `my-release` at version 0.2.0:
To install the chart with the release name `my-release` at version 0.2.1:

```bash
helm repo add rstudio https://helm.rstudio.com
helm upgrade --install my-release rstudio/posit-chronicle --version=0.2.0
helm upgrade --install my-release rstudio/posit-chronicle --version=0.2.1
```

To explore other chart versions, take a look at:
Expand All @@ -41,36 +41,41 @@ with the Workbench and Connect charts. To actually send data to the server, you
will need to run the Chronicle agent as a sidecar container on your
Workbench or Connect server pods by setting `pod.sidecar` in their respective `values.yaml` files

Here is an example of Helm values to run the agent sidecar in Workbench:
Here is an example of Helm values to run the agent sidecar in **Workbench**,
where we set up a shared volume between containers for audit logs:

```yaml
pod:
# We will need to create a new volume to share audit logs between
# the rstudio (workbench) and chronicle-agent containers
volumes:
- name: logs
emptyDir: {}
volumeMounts:
- name: logs
mountPath: "/var/lib/rstudio-server/audit"
sidecar:
- name: chronicle-agent
image: posit-chronicle:2023.11.3
image: ghcr.io/rstudio/chronicle-agent:2023.10.4
volumeMounts:
- name: CHRONICLE_PRODUCT_CLUSTER_ID
value: "posit-cluster-1"
- name: logs
mountPath: "/var/lib/rstudio-server/audit"
env:
- name: CHRONICLE_SERVER_ADDRESS
value: "http://chronicle-server.default.svc.cluster.local"
value: "http://chronicle-server.default"
```

And here is an example of Helm values for Connect, where a Connect
And here is an example of Helm values for Connect, where a **Connect**
API key from a Kubernetes Secret is used to unlock more detailed metrics:

```yaml
pod:
sidecar:
- name: chronicle-agent
image: posit-chronicle:2023.11.3
image: ghcr.io/rstudio/chronicle-agent:2023.10.4
env:
- name: CHRONICLE_PRODUCT_CLUSTER_ID
value: "posit-cluster-1"
- name: CHRONICLE_SERVER_ADDRESS
value: "http://chronicle-server.default.svc.cluster.local"
value: "http://chronicle-server.default"
- name: CONNECT_API_KEY
valueFrom:
secretKeyRef:
Expand Down
25 changes: 15 additions & 10 deletions charts/posit-chronicle/README.md.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -15,36 +15,41 @@ with the Workbench and Connect charts. To actually send data to the server, you
will need to run the Chronicle agent as a sidecar container on your
Workbench or Connect server pods by setting `pod.sidecar` in their respective `values.yaml` files

Here is an example of Helm values to run the agent sidecar in Workbench:
Here is an example of Helm values to run the agent sidecar in **Workbench**,
where we set up a shared volume between containers for audit logs:

```yaml
pod:
# We will need to create a new volume to share audit logs between
# the rstudio (workbench) and chronicle-agent containers
volumes:
- name: logs
emptyDir: {}
volumeMounts:
- name: logs
mountPath: "/var/lib/rstudio-server/audit"
sidecar:
- name: chronicle-agent
image: posit-chronicle:2023.11.3
image: ghcr.io/rstudio/chronicle-agent:2023.10.4
volumeMounts:
- name: CHRONICLE_PRODUCT_CLUSTER_ID
value: "posit-cluster-1"
- name: logs
mountPath: "/var/lib/rstudio-server/audit"
env:
- name: CHRONICLE_SERVER_ADDRESS
value: "http://chronicle-server.default.svc.cluster.local"
value: "http://chronicle-server.default"
```

And here is an example of Helm values for Connect, where a Connect
And here is an example of Helm values for Connect, where a **Connect**
API key from a Kubernetes Secret is used to unlock more detailed metrics:

```yaml
pod:
sidecar:
- name: chronicle-agent
image: posit-chronicle:2023.11.3
image: ghcr.io/rstudio/chronicle-agent:2023.10.4
env:
- name: CHRONICLE_PRODUCT_CLUSTER_ID
value: "posit-cluster-1"
- name: CHRONICLE_SERVER_ADDRESS
value: "http://chronicle-server.default.svc.cluster.local"
value: "http://chronicle-server.default"
- name: CONNECT_API_KEY
valueFrom:
secretKeyRef:
Expand Down
6 changes: 3 additions & 3 deletions charts/rstudio-connect/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: rstudio-library
repository: file://../rstudio-library
version: 0.1.27
digest: sha256:623d9c7ae9b9501578e55f4dd041a934cc67546c2a5608678d88ac538b2cef00
generated: "2023-10-24T10:12:40.139874-04:00"
version: 0.1.28
digest: sha256:91ea79ae369c78eca2fd08f229bbb5db6fd955da040baca71b255181a2f8aa21
generated: "2024-01-24T14:32:14.663744-05:00"
5 changes: 3 additions & 2 deletions charts/rstudio-connect/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: rstudio-connect
description: Official Helm chart for RStudio Connect
version: 0.5.12
version: 0.5.13
apiVersion: v2
appVersion: 2024.01.0
icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
Expand All @@ -13,7 +13,7 @@ maintainers:
url: https://github.com/sol-eng
dependencies:
- name: rstudio-library
version: 0.1.27
version: 0.1.28
repository: file://../rstudio-library
annotations:
artifacthub.io/images: |
Expand All @@ -37,3 +37,4 @@ keywords:
- "python"
- "deploy"
- "rstudio"
- "posit"
2 changes: 1 addition & 1 deletion charts/rstudio-connect/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License

Copyright (c) 2021 RStudio PBC
Copyright (c) 2023 Posit Software, PBC

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 4 additions & 0 deletions charts/rstudio-connect/NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 0.5.13

- Add option to set `pod.terminationGracePeriodSeconds`

# 0.5.12

- Bump Connect version to 2024.01.0
Expand Down
7 changes: 4 additions & 3 deletions charts/rstudio-connect/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# RStudio Connect

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

#### _Official Helm chart for RStudio Connect_

Expand All @@ -26,11 +26,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.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-connect --version=0.5.12
helm upgrade --install my-release rstudio/rstudio-connect --version=0.5.13
```

To explore other chart versions, take a look at:
Expand Down Expand Up @@ -173,6 +173,7 @@ The Helm `config` values are converted into the `rstudio-connect.gcfg` service c
| pod.port | int | `3939` | The containerPort used by the main pod container |
| pod.securityContext | object | `{}` | Values to set the `securityContext` for the connect pod |
| pod.sidecar | bool | `false` | An array of containers that will be run alongside the main pod |
| pod.terminationGracePeriodSeconds | int | `120` | The termination grace period seconds allowed for the pod before shutdown |
| pod.volumeMounts | list | `[]` | An array of maps that is injected as-is into the "volumeMounts" component of the pod spec |
| pod.volumes | list | `[]` | An array of maps that is injected as-is into the "volumes:" component of the pod spec |
| podDisruptionBudget | object | `{}` | Pod disruption budget |
Expand Down
11 changes: 9 additions & 2 deletions charts/rstudio-connect/ci/complex-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ service:
podDisruptionBudget:
minAvailable: 30%

nodeSelector:
something: special

pod:
env:
- name: RSTUDIO_CONNECT_HASTE
Expand All @@ -45,9 +48,13 @@ pod:
command: ["sleep"]
args: ["infinity"]
imagePullPolicy: "IfNotPresent"
# This will spin up the chronicle-agent sidecar container
- name: chronicle-agent
image: ghcr.io/rstudio/chronicle-agent:2023.10.4
env:
- name: CHRONICLE_SERVER_ADDRESS
value: "http://chronicle-server.default"
priorityClassName: something-fun
nodeSelector:
something: special
tolerations:
- key: "example-key"
operator: "Exists"
Expand Down
1 change: 1 addition & 0 deletions charts/rstudio-connect/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ spec:
{{- if .Values.pod.sidecar }}
{{ toYaml .Values.pod.sidecar | indent 6 }}
{{- end }}
terminationGracePeriodSeconds: {{ .Values.pod.terminationGracePeriodSeconds }}
volumes:
- name: rstudio-connect-config
configMap:
Expand Down
2 changes: 2 additions & 0 deletions charts/rstudio-connect/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ pod:
securityContext: {}
# -- The containerPort used by the main pod container
port: 3939
# -- The termination grace period seconds allowed for the pod before shutdown
terminationGracePeriodSeconds: 120

# -- The pod's run command. By default, it uses the container's default
command: []
Expand Down
6 changes: 3 additions & 3 deletions charts/rstudio-launcher-rbac/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: rstudio-library
repository: file://../rstudio-library
version: 0.1.27
digest: sha256:623d9c7ae9b9501578e55f4dd041a934cc67546c2a5608678d88ac538b2cef00
generated: "2023-10-24T10:18:58.864999-04:00"
version: 0.1.28
digest: sha256:91ea79ae369c78eca2fd08f229bbb5db6fd955da040baca71b255181a2f8aa21
generated: "2024-01-24T14:32:17.220248-05:00"
7 changes: 4 additions & 3 deletions charts/rstudio-launcher-rbac/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: rstudio-launcher-rbac
description: RBAC definition for the RStudio Job Launcher
type: application
version: 0.2.18
appVersion: 0.2.18
version: 0.2.19
appVersion: 0.2.19
icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
sources:
- https://github.com/rstudio/helm
Expand All @@ -13,11 +13,12 @@ maintainers:
url: https://github.com/sol-eng
dependencies:
- name: rstudio-library
version: 0.1.27
version: 0.1.28
repository: file://../rstudio-library
keywords:
- "data science"
- "machine learning"
- "launcher"
- "rbac"
- "rstudio"
- "posit"
2 changes: 1 addition & 1 deletion charts/rstudio-launcher-rbac/LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License

Copyright (c) 2021 RStudio PBC
Copyright (c) 2023 Posit Software, PBC

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion charts/rstudio-launcher-rbac/NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 0.2.18
# 0.2.18+

- Bump rstudio-library to `0.1.27`
- Fix an issue with `mountPath` and `subPath` when `license.file.mountSubPath` is `true`
Expand Down
6 changes: 3 additions & 3 deletions charts/rstudio-launcher-rbac/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# rstudio-launcher-rbac

![Version: 0.2.18](https://img.shields.io/badge/Version-0.2.18-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.18](https://img.shields.io/badge/AppVersion-0.2.18-informational?style=flat-square)
![Version: 0.2.19](https://img.shields.io/badge/Version-0.2.19-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.19](https://img.shields.io/badge/AppVersion-0.2.19-informational?style=flat-square)

#### _RBAC definition for the RStudio Job Launcher_

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

## Installing the Chart

To install the chart with the release name `my-release` at version 0.2.18:
To install the chart with the release name `my-release` at version 0.2.19:

```bash
helm repo add rstudio https://helm.rstudio.com
helm upgrade --install my-release rstudio/rstudio-launcher-rbac --version=0.2.18
helm upgrade --install my-release rstudio/rstudio-launcher-rbac --version=0.2.19
```

To explore other chart versions, take a look at:
Expand Down
7 changes: 4 additions & 3 deletions charts/rstudio-library/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v2
name: rstudio-library
description: Helm library helpers for use by Official RStudio charts
description: Helm library helpers for use by official RStudio charts
type: library
version: 0.1.27
appVersion: 0.1.27
version: 0.1.28
appVersion: 0.1.28

icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
home: https://www.rstudio.com
Expand All @@ -23,3 +23,4 @@ annotations:
keywords:
- "rstudio"
- "library"
- "posit"
4 changes: 4 additions & 0 deletions charts/rstudio-library/NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 0.1.28

- Tweak docs a bit

# 0.1.27

- Fix an issue with `mountPath` and `subPath` when `license.file.mountSubPath` is `true` ([#427](https://github.com/rstudio/helm/issues/427)).
Expand Down
Loading
Loading