Merge pull request #457 from rstudio/dev

Pull in a few misc PRs
rstudio · Feb 13, 2024 · 6bc4b0e · 6bc4b0e
2 parents ca755dd + d4600c6
commit 6bc4b0e
Show file tree

Hide file tree

Showing 41 changed files with 251 additions and 87 deletions.
diff --git a/LICENSE b/LICENSE
@@ -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

diff --git a/README.md b/README.md
@@ -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
@@ -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.

diff --git a/charts/posit-chronicle/Chart.yaml b/charts/posit-chronicle/Chart.yaml
@@ -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

diff --git a/charts/posit-chronicle/NEWS.md b/charts/posit-chronicle/NEWS.md
@@ -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

diff --git a/charts/posit-chronicle/README.md b/charts/posit-chronicle/README.md
@@ -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_
 
@@ -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:
@@ -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:

diff --git a/charts/posit-chronicle/README.md.gotmpl b/charts/posit-chronicle/README.md.gotmpl
@@ -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:

diff --git a/charts/rstudio-connect/Chart.lock b/charts/rstudio-connect/Chart.lock
@@ -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"
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 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
@@ -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: |
@@ -37,3 +37,4 @@ keywords:
   - "python"
   - "deploy"
   - "rstudio"
+  - "posit"
diff --git a/charts/rstudio-connect/LICENSE b/charts/rstudio-connect/LICENSE
@@ -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

diff --git a/charts/rstudio-connect/NEWS.md b/charts/rstudio-connect/NEWS.md
@@ -1,3 +1,7 @@
+# 0.5.13
+
+- Add option to set `pod.terminationGracePeriodSeconds`
+
 # 0.5.12
 
 - Bump Connect version to 2024.01.0

diff --git a/charts/rstudio-connect/README.md b/charts/rstudio-connect/README.md
@@ -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_
 
@@ -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:
@@ -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 |

diff --git a/charts/rstudio-connect/ci/complex-values.yaml b/charts/rstudio-connect/ci/complex-values.yaml
@@ -25,6 +25,9 @@ service:
 podDisruptionBudget:
   minAvailable: 30%
 
+nodeSelector:
+  something: special
+
 pod:
   env:
     - name: RSTUDIO_CONNECT_HASTE
@@ -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"

diff --git a/charts/rstudio-connect/templates/deployment.yaml b/charts/rstudio-connect/templates/deployment.yaml
@@ -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:

diff --git a/charts/rstudio-connect/values.yaml b/charts/rstudio-connect/values.yaml
@@ -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: []

diff --git a/charts/rstudio-launcher-rbac/Chart.lock b/charts/rstudio-launcher-rbac/Chart.lock
@@ -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"
diff --git a/charts/rstudio-launcher-rbac/Chart.yaml b/charts/rstudio-launcher-rbac/Chart.yaml
@@ -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
@@ -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"
diff --git a/charts/rstudio-launcher-rbac/LICENSE b/charts/rstudio-launcher-rbac/LICENSE
@@ -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

diff --git a/charts/rstudio-launcher-rbac/NEWS.md b/charts/rstudio-launcher-rbac/NEWS.md
@@ -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`

diff --git a/charts/rstudio-launcher-rbac/README.md b/charts/rstudio-launcher-rbac/README.md
@@ -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_
 
@@ -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:

diff --git a/charts/rstudio-library/Chart.yaml b/charts/rstudio-library/Chart.yaml
@@ -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
@@ -23,3 +23,4 @@ annotations:
 keywords:
   - "rstudio"
   - "library"
+  - "posit"
diff --git a/charts/rstudio-library/NEWS.md b/charts/rstudio-library/NEWS.md
@@ -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)).