Merge pull request #128 from rstudio/add-extra-deploy

Add extra deploy
rstudio · Jan 4, 2022 · 4685fd5 · 4685fd5
2 parents e3480e1 + 549dcd1
commit 4685fd5
Show file tree

Hide file tree

Showing 29 changed files with 215 additions and 36 deletions.
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.19
-digest: sha256:3a52152a14dd67c078b2b6b66747e31618aaa97abbe3e8255b59762766bbb463
-generated: "2021-12-17T12:28:47.58543-05:00"
+  version: 0.1.20
+digest: sha256:a5ccf4891923ecb54dad073d20e43034c7d35ca98f588f2306a4742049fbb4ab
+generated: "2022-01-03T15:39:08.464697-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.2.18
+version: 0.2.19
 apiVersion: v2
 appVersion: 2021.12.1
 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.19
+    version: 0.1.20
     repository: file://../rstudio-library
 annotations:
   artifacthub.io/images: |

diff --git a/charts/rstudio-connect/NEWS.md b/charts/rstudio-connect/NEWS.md
@@ -1,3 +1,8 @@
+# 0.2.19
+
+- Update `rstudio-library` chart version. This adds support for `extraObjects`
+- Add `extraObjects` value. This allows deploying additional resources (with templating) straight from the values file!
+
 # 0.2.18
 
 - Bump Connect version to 2021.12.1

diff --git a/charts/rstudio-connect/README.md b/charts/rstudio-connect/README.md
@@ -1,6 +1,6 @@
 # RStudio Connect
 
-![Version: 0.2.18](https://img.shields.io/badge/Version-0.2.18-informational?style=flat-square) ![AppVersion: 2021.12.1](https://img.shields.io/badge/AppVersion-2021.12.1-informational?style=flat-square)
+![Version: 0.2.19](https://img.shields.io/badge/Version-0.2.19-informational?style=flat-square) ![AppVersion: 2021.12.1](https://img.shields.io/badge/AppVersion-2021.12.1-informational?style=flat-square)
 
 #### _Official Helm chart for RStudio Connect_
 
@@ -23,11 +23,11 @@ As a result, 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 install my-release rstudio/rstudio-connect --version=0.2.18
+helm install my-release rstudio/rstudio-connect --version=0.2.19
 ```
 
 ## Required Configuration
@@ -68,6 +68,7 @@ The Helm `config` values are converted into the `rstudio-connect.gcfg` service c
 | args | list | `[]` | The pod's run arguments. By default, it uses the container's default |
 | command | list | `[]` | The pod's run command. By default, it uses the container's default |
 | config | object | [RStudio Connect Configuration Reference](https://docs.rstudio.com/connect/admin/appendix/configuration/) | A nested map of maps that generates the rstudio-connect.gcfg file |
+| extraObjects | list | `[]` | Extra objects to deploy (value evaluated as a template) |
 | fullnameOverride | string | `""` | The full name of the release (can be overridden) |
 | image | object | `{"imagePullPolicy":"IfNotPresent","imagePullSecrets":[],"repository":"ghcr.io/rstudio/rstudio-connect","tag":""}` | Defines the RStudio Connect image to deploy |
 | image.imagePullPolicy | string | `"IfNotPresent"` | The imagePullPolicy for the main pod image |

diff --git a/charts/rstudio-connect/ci/complex-values.yaml b/charts/rstudio-connect/ci/complex-values.yaml
@@ -60,6 +60,21 @@ initContainers:
       - mountPath: /testing
         name: test
 
+extraObjects:
+  - apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: "test"
+    data:
+      something: fun
+  - |
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: "test2"
+    data:
+      something: {{ printf "fun2" }}
+
 license:
   key: test
 replicas: 2

diff --git a/charts/rstudio-connect/templates/extra-objects.yaml b/charts/rstudio-connect/templates/extra-objects.yaml
@@ -0,0 +1,4 @@
+{{- range .Values.extraObjects }}
+---
+{{ include "rstudio-library.tplvalues.render" (dict "value" . "context" $) }}
+{{- end }}
diff --git a/charts/rstudio-connect/values.yaml b/charts/rstudio-connect/values.yaml
@@ -37,6 +37,9 @@ rbac:
     name: ""
     annotations: {}
 
+# -- Extra objects to deploy (value evaluated as a template)
+extraObjects: []
+
 # -- Defines the RStudio Connect image to deploy
 image:
   # -- The repository to use for the main pod image

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.19
-digest: sha256:3a52152a14dd67c078b2b6b66747e31618aaa97abbe3e8255b59762766bbb463
-generated: "2021-12-22T09:57:49.943264-05:00"
+  version: 0.1.20
+digest: sha256:a5ccf4891923ecb54dad073d20e43034c7d35ca98f588f2306a4742049fbb4ab
+generated: "2022-01-03T15:39:14.629633-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.9
-appVersion: 0.2.9
+version: 0.2.10
+appVersion: 0.2.10
 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
 sources:
   - https://github.com/rstudio/helm
@@ -13,7 +13,7 @@ maintainers:
     url: https://github.com/sol-eng
 dependencies:
   - name: rstudio-library
-    version: 0.1.19
+    version: 0.1.20
     repository: file://../rstudio-library
 keywords:
   - "data science"

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.9](https://img.shields.io/badge/Version-0.2.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.9](https://img.shields.io/badge/AppVersion-0.2.9-informational?style=flat-square)
+![Version: 0.2.10](https://img.shields.io/badge/Version-0.2.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.10](https://img.shields.io/badge/AppVersion-0.2.10-informational?style=flat-square)
 
 #### _RBAC definition for the RStudio Job Launcher_
 
@@ -20,11 +20,11 @@ As a result, please:
 
 ## Installing the Chart
 
-To install the chart with the release name `my-release` at version 0.2.9:
+To install the chart with the release name `my-release` at version 0.2.10:
 
 ```bash
 helm repo add rstudio https://helm.rstudio.com
-helm install my-release rstudio/rstudio-launcher-rbac --version=0.2.9
+helm install my-release rstudio/rstudio-launcher-rbac --version=0.2.10
 ```
 
 ## Common Usage

diff --git a/charts/rstudio-library/Chart.yaml b/charts/rstudio-library/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: rstudio-library
 description: Helm library helpers for use by Official RStudio charts
 type: library
-version: 0.1.19
-appVersion: 0.1.19
+version: 0.1.20
+appVersion: 0.1.20
 
 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
 home: https://www.rstudio.com

diff --git a/charts/rstudio-library/NEWS.md b/charts/rstudio-library/NEWS.md
@@ -1,3 +1,9 @@
+# 0.1.20
+
+- Add a `_tplvalues.tpl` helper
+  - this allows templating "extra" deployments in values
+  - taken from [this excellent example by bitnami](https://github.com/bitnami/charts/blob/master/bitnami/common/templates/_tplvalues.tpl)
+
 # 0.1.19
 
 - Add an `Ingress` helper

diff --git a/charts/rstudio-library/README.md b/charts/rstudio-library/README.md
@@ -1,6 +1,6 @@
 # rstudio-library
 
-![Version: 0.1.19](https://img.shields.io/badge/Version-0.1.19-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: 0.1.19](https://img.shields.io/badge/AppVersion-0.1.19-informational?style=flat-square)
+![Version: 0.1.20](https://img.shields.io/badge/Version-0.1.20-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: 0.1.20](https://img.shields.io/badge/AppVersion-0.1.20-informational?style=flat-square)
 
 #### _Helm library helpers for use by Official RStudio charts_
 

diff --git a/charts/rstudio-library/templates/_tplvalues.tpl b/charts/rstudio-library/templates/_tplvalues.tpl
@@ -0,0 +1,14 @@
+{{/* vim: set filetype=mustache: */}}
+{{/* thanks to https://github.com/bitnami/charts/blob/master/bitnami/common/templates/_tplvalues.tpl */}}
+{{/*
+Renders a value that contains template.
+Usage:
+{{ include "rstudio-library.tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }}
+*/}}
+{{- define "rstudio-library.tplvalues.render" -}}
+    {{- if typeIs "string" .value }}
+        {{- tpl .value .context }}
+    {{- else }}
+        {{- tpl (.value | toYaml) .context }}
+    {{- end }}
+{{- end -}}
diff --git a/charts/rstudio-pm/Chart.lock b/charts/rstudio-pm/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: rstudio-library
   repository: file://../rstudio-library
-  version: 0.1.19
-digest: sha256:3a52152a14dd67c078b2b6b66747e31618aaa97abbe3e8255b59762766bbb463
-generated: "2021-12-17T12:30:43.992325-05:00"
+  version: 0.1.20
+digest: sha256:a5ccf4891923ecb54dad073d20e43034c7d35ca98f588f2306a4742049fbb4ab
+generated: "2022-01-03T15:39:20.484511-05:00"
diff --git a/charts/rstudio-pm/Chart.yaml b/charts/rstudio-pm/Chart.yaml
@@ -1,6 +1,6 @@
 name: rstudio-pm
 description: Official Helm chart for RStudio Package Manager
-version: 0.3.0
+version: 0.3.1
 apiVersion: v2
 appVersion: 2021.09.0-1
 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png
@@ -14,7 +14,7 @@ maintainers:
     url: https://github.com/rstudio/helm
 dependencies:
   - name: rstudio-library
-    version: 0.1.19
+    version: 0.1.20
     repository: file://../rstudio-library
 annotations:
   artifacthub.io/images: |

diff --git a/charts/rstudio-pm/NEWS.md b/charts/rstudio-pm/NEWS.md
@@ -1,3 +1,8 @@
+# 0.3.1
+
+- Update `rstudio-library` chart version. This adds support for `extraObjects`
+- Add `extraObjects` value. This allows deploying additional resources (with templating) straight from the values file!
+
 # 0.3.0
 
 - BREAKING: The generated service will now have type `ClusterIP` by default.

diff --git a/charts/rstudio-pm/README.md b/charts/rstudio-pm/README.md
@@ -1,6 +1,6 @@
 # RStudio Package Manager
 
-![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![AppVersion: 2021.09.0-1](https://img.shields.io/badge/AppVersion-2021.09.0--1-informational?style=flat-square)
+![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![AppVersion: 2021.09.0-1](https://img.shields.io/badge/AppVersion-2021.09.0--1-informational?style=flat-square)
 
 #### _Official Helm chart for RStudio Package Manager_
 
@@ -23,11 +23,11 @@ As a result, please:
 
 ## Installing the Chart
 
-To install the chart with the release name `my-release` at version 0.3.0:
+To install the chart with the release name `my-release` at version 0.3.1:
 
 ```bash
 helm repo add rstudio https://helm.rstudio.com
-helm install my-release rstudio/rstudio-pm --version=0.3.0
+helm install my-release rstudio/rstudio-pm --version=0.3.1
 ```
 
 ## Required Configuration
@@ -88,6 +88,7 @@ The Helm `config` values are converted into the `rstudio-pm.gcfg` service config
 | 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"},"Launcher":{"AdminGroup":"root","ServerUser":"root"},"Metrics":{"Enabled":true}}` | config is a nested map of maps that generates the rstudio-pm.gcfg file |
+| extraObjects | list | `[]` | Extra objects to deploy (value evaluated as a template) |
 | fullnameOverride | string | `""` | the full name of the release (can be overridden) |
 | image.imagePullPolicy | string | `"IfNotPresent"` | the imagePullPolicy for the main pod image |
 | image.imagePullSecrets | list | `[]` | an array of kubernetes secrets for pulling the main pod image from private registries |

diff --git a/charts/rstudio-pm/ci/all-values.yaml b/charts/rstudio-pm/ci/all-values.yaml
@@ -47,3 +47,18 @@ initContainers:
     image: busybox
     command: ["echo"]
     args: ["init"]
+
+extraObjects:
+  - apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: "test"
+    data:
+      something: fun
+  - |
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: "test2"
+    data:
+      something: {{ printf "fun2" }}
diff --git a/charts/rstudio-pm/templates/extra-objects.yaml b/charts/rstudio-pm/templates/extra-objects.yaml
@@ -0,0 +1,4 @@
+{{- range .Values.extraObjects }}
+---
+{{ include "rstudio-library.tplvalues.render" (dict "value" . "context" $) }}
+{{- end }}
diff --git a/charts/rstudio-pm/values.yaml b/charts/rstudio-pm/values.yaml
@@ -101,6 +101,9 @@ pod:
   # -- annotations is a map of keys / values that will be added as annotations to the pods
   annotations: {}
 
+# -- Extra objects to deploy (value evaluated as a template)
+extraObjects: []
+
 # -- resources define requests and limits for the rstudio-pm pod
 resources:
   requests:

diff --git a/charts/rstudio-workbench/Chart.lock b/charts/rstudio-workbench/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: rstudio-library
   repository: file://../rstudio-library
-  version: 0.1.19
-digest: sha256:3a52152a14dd67c078b2b6b66747e31618aaa97abbe3e8255b59762766bbb463
-generated: "2021-12-17T12:27:45.001668-05:00"
+  version: 0.1.20
+digest: sha256:a5ccf4891923ecb54dad073d20e43034c7d35ca98f588f2306a4742049fbb4ab
+generated: "2022-01-03T15:39:26.30041-05:00"
diff --git a/charts/rstudio-workbench/Chart.yaml b/charts/rstudio-workbench/Chart.yaml
@@ -1,6 +1,6 @@
 name: rstudio-workbench
 description: Official Helm chart for RStudio Workbench
-version: 0.5.1
+version: 0.5.2
 apiVersion: v2
 appVersion: 2021.09.0-351.pro6
 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.19
+    version: 0.1.20
     repository: file://../rstudio-library
 annotations:
   artifacthub.io/images: |

diff --git a/charts/rstudio-workbench/NEWS.md b/charts/rstudio-workbench/NEWS.md
@@ -1,3 +1,8 @@
+# 0.5.2
+
+- Update `rstudio-library` chart version. This adds support for `extraObjects`
+- Add `extraObjects` value. This allows deploying additional resources (with templating) straight from the values file!
+
 # 0.5.1
 
 - Update `rstudio-library` chart version. This adds a helper for rendering `Ingress` resources

diff --git a/charts/rstudio-workbench/README.md b/charts/rstudio-workbench/README.md
@@ -1,6 +1,6 @@
 # RStudio Workbench
 
-![Version: 0.5.1](https://img.shields.io/badge/Version-0.5.1-informational?style=flat-square) ![AppVersion: 2021.09.0-351.pro6](https://img.shields.io/badge/AppVersion-2021.09.0--351.pro6-informational?style=flat-square)
+![Version: 0.5.2](https://img.shields.io/badge/Version-0.5.2-informational?style=flat-square) ![AppVersion: 2021.09.0-351.pro6](https://img.shields.io/badge/AppVersion-2021.09.0--351.pro6-informational?style=flat-square)
 
 #### _Official Helm chart for RStudio Workbench_
 
@@ -23,11 +23,11 @@ As a result, please:
 
 ## Installing the Chart
 
-To install the chart with the release name `my-release` at version 0.5.1:
+To install the chart with the release name `my-release` at version 0.5.2:
 
 ```bash
 helm repo add rstudio https://helm.rstudio.com
-helm install my-release rstudio/rstudio-workbench --version=0.5.1
+helm install my-release rstudio/rstudio-workbench --version=0.5.2
 ```
 
 ## Required Configuration
@@ -321,6 +321,7 @@ config:
 | config.userProvisioning | object | `{}` | a map of sssd config files, used for user provisioning. Mounted to `/etc/sssd/conf.d/` with 0600 permissions |
 | dangerRegenerateAutomatedValues | bool | `false` |  |
 | diagnostics | object | `{"directory":"/var/log/rstudio","enabled":false}` | Settings for enabling server diagnostics |
+| extraObjects | list | `[]` | Extra objects to deploy (value evaluated as a template) |
 | fullnameOverride | string | `""` | the full name of the release (can be overridden) |
 | global.secureCookieKey | string | `""` |  |
 | homeStorage.accessModes | list | `["ReadWriteMany"]` | accessModes defined for the storage PVC (represented as YAML) |

diff --git a/charts/rstudio-workbench/ci/complex-values.yaml b/charts/rstudio-workbench/ci/complex-values.yaml
@@ -74,6 +74,21 @@ prometheusExporter:
           host: "$1"
           duration: "$2"
 
+extraObjects:
+  - apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: "test"
+    data:
+      something: fun
+  - |
+    apiVersion: v1
+    kind: ConfigMap
+    metadata:
+      name: "test2"
+    data:
+      something: {{ printf "fun2" }}
+
 jobJsonOverridesFiles:
   test:
     one: two

diff --git a/charts/rstudio-workbench/templates/extra-objects.yaml b/charts/rstudio-workbench/templates/extra-objects.yaml
@@ -0,0 +1,4 @@
+{{- range .Values.extraObjects }}
+---
+{{ include "rstudio-library.tplvalues.render" (dict "value" . "context" $) }}
+{{- end }}