From d324dbadd21c008ee5cb6b1de010b12b5dea59ae Mon Sep 17 00:00:00 2001 From: Bill Sager Date: Thu, 4 Nov 2021 15:27:38 -0700 Subject: [PATCH 01/17] Moving conf to launcher specific location --- charts/rstudio-connect/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rstudio-connect/templates/deployment.yaml b/charts/rstudio-connect/templates/deployment.yaml index a92e136d..34aaf47f 100644 --- a/charts/rstudio-connect/templates/deployment.yaml +++ b/charts/rstudio-connect/templates/deployment.yaml @@ -89,7 +89,7 @@ spec: mountPath: "/etc/rstudio-connect/runtime.yaml" subPath: "runtime.yaml" - name: rstudio-connect-config - mountPath: "/etc/rstudio-connect/launcher.kubernetes.profiles.conf" + mountPath: "/etc/rstudio-connect/launcher/launcher.kubernetes.profiles.conf" subPath: "launcher.kubernetes.profiles.conf" {{- end }} {{- if or .Values.sharedStorage.create .Values.sharedStorage.mount }} From c14003d0ab90b2b4b3522aa61c012cb19b966407 Mon Sep 17 00:00:00 2001 From: Bill Sager Date: Fri, 5 Nov 2021 12:05:38 -0700 Subject: [PATCH 02/17] move profile config file and remove need for priviledged --- charts/rstudio-connect/Chart.yaml | 4 ++-- charts/rstudio-connect/NEWS.md | 5 +++++ charts/rstudio-connect/templates/_helpers.tpl | 2 +- charts/rstudio-connect/templates/deployment.yaml | 2 -- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/charts/rstudio-connect/Chart.yaml b/charts/rstudio-connect/Chart.yaml index 38388f1f..13a0b659 100644 --- a/charts/rstudio-connect/Chart.yaml +++ b/charts/rstudio-connect/Chart.yaml @@ -1,8 +1,8 @@ name: rstudio-connect description: Official Helm chart for RStudio Connect -version: 0.2.9 +version: 0.2.10 apiVersion: v2 -appVersion: 2021.10.0 +appVersion: 2021.11.0 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png home: https://www.rstudio.com sources: diff --git a/charts/rstudio-connect/NEWS.md b/charts/rstudio-connect/NEWS.md index d36c692a..12546ceb 100644 --- a/charts/rstudio-connect/NEWS.md +++ b/charts/rstudio-connect/NEWS.md @@ -1,3 +1,8 @@ +# 0.2.10 + +- remove "privileged: true", which is not necessary for rstudio-connect server or sessions +- location for RStudio Connect's KubernetesProfilesConfig file has changed so as to not conflict with RStudio Workbench + # 0.2.9 - Add `imagePullSecrets` value option ([#57](https://github.com/rstudio/helm/issues/57)) diff --git a/charts/rstudio-connect/templates/_helpers.tpl b/charts/rstudio-connect/templates/_helpers.tpl index 269aaf29..e5eb10af 100644 --- a/charts/rstudio-connect/templates/_helpers.tpl +++ b/charts/rstudio-connect/templates/_helpers.tpl @@ -62,7 +62,7 @@ app.kubernetes.io/instance: {{ .Release.Name }} {{- /* default launcher configuration */}} {{- if .Values.launcher.enabled }} {{- $namespace := default $.Release.Namespace .Values.launcher.namespace }} - {{- $launcherSettingsDict := dict "Enabled" ("true") "Kubernetes" ("true") "ClusterDefinition" (list "/etc/rstudio-connect/runtime.yaml") "KubernetesNamespace" ($namespace) "KubernetesProfilesConfig" ("/etc/rstudio-connect/launcher.kubernetes.profiles.conf") }} + {{- $launcherSettingsDict := dict "Enabled" ("true") "Kubernetes" ("true") "ClusterDefinition" (list "/etc/rstudio-connect/runtime.yaml") "KubernetesNamespace" ($namespace) "KubernetesProfilesConfig" ("/etc/rstudio-connect/launcher/launcher.kubernetes.profiles.conf") }} {{- $launcherDict := dict "Launcher" ( $launcherSettingsDict ) }} {{- $pythonSettingsDict := dict "Enabled" ("true") }} {{- $pythonDict := dict "Python" ( $pythonSettingsDict ) }} diff --git a/charts/rstudio-connect/templates/deployment.yaml b/charts/rstudio-connect/templates/deployment.yaml index 34aaf47f..8ad1d550 100644 --- a/charts/rstudio-connect/templates/deployment.yaml +++ b/charts/rstudio-connect/templates/deployment.yaml @@ -78,8 +78,6 @@ spec: imagePullPolicy: "{{ .Values.image.imagePullPolicy }}" ports: - containerPort: 3939 - securityContext: - privileged: true volumeMounts: - name: rstudio-connect-config mountPath: "/etc/rstudio-connect/rstudio-connect.gcfg" From 4d79ca5dc2be2146b08f9b24e0095c94c9261c47 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 5 Nov 2021 19:06:08 +0000 Subject: [PATCH 03/17] Update helm-docs and README.md --- charts/rstudio-connect/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/rstudio-connect/README.md b/charts/rstudio-connect/README.md index a8e7f73f..ad16d45b 100644 --- a/charts/rstudio-connect/README.md +++ b/charts/rstudio-connect/README.md @@ -1,6 +1,6 @@ # RStudio Connect -![Version: 0.2.9](https://img.shields.io/badge/Version-0.2.9-informational?style=flat-square) ![AppVersion: 2021.10.0](https://img.shields.io/badge/AppVersion-2021.10.0-informational?style=flat-square) +![Version: 0.2.10](https://img.shields.io/badge/Version-0.2.10-informational?style=flat-square) ![AppVersion: 2021.11.0](https://img.shields.io/badge/AppVersion-2021.11.0-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.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-connect --version=0.2.9 +helm install my-release rstudio/rstudio-connect --version=0.2.10 ``` ## Required Configuration From a97676c6a0b68d4b0e905ba31df2cbc40ecd3080 Mon Sep 17 00:00:00 2001 From: Bill Sager Date: Mon, 8 Nov 2021 15:19:49 -0800 Subject: [PATCH 04/17] news update --- charts/rstudio-connect/NEWS.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/rstudio-connect/NEWS.md b/charts/rstudio-connect/NEWS.md index 12546ceb..3d6eb989 100644 --- a/charts/rstudio-connect/NEWS.md +++ b/charts/rstudio-connect/NEWS.md @@ -1,7 +1,8 @@ # 0.2.10 - remove "privileged: true", which is not necessary for rstudio-connect server or sessions -- location for RStudio Connect's KubernetesProfilesConfig file has changed so as to not conflict with RStudio Workbench +- location for RStudio Connect's KubernetesProfilesConfig file has changed from `/etc/rstudio/launcher.kubernetes.profiles.conf` to `/etc/rstudio-connect/launcher/launcher.kubernetes.profiles.conf` so as to not conflict with RStudio Workbench +- Update default RStudio Connect version to 2021.11.0 # 0.2.9 From 1f60183d0ab1428ddfcda62c8ddc0e8a5cfa9ad7 Mon Sep 17 00:00:00 2001 From: Cole Arendt Date: Wed, 17 Nov 2021 16:25:46 -0500 Subject: [PATCH 05/17] bump chart version --- charts/rstudio-connect/Chart.yaml | 2 +- charts/rstudio-connect/README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/rstudio-connect/Chart.yaml b/charts/rstudio-connect/Chart.yaml index a79a8ca9..711d10f7 100644 --- 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.10 +version: 0.2.11 apiVersion: v2 appVersion: 2021.11.0 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png diff --git a/charts/rstudio-connect/README.md b/charts/rstudio-connect/README.md index ad16d45b..c930b1c7 100644 --- a/charts/rstudio-connect/README.md +++ b/charts/rstudio-connect/README.md @@ -1,6 +1,6 @@ # RStudio Connect -![Version: 0.2.10](https://img.shields.io/badge/Version-0.2.10-informational?style=flat-square) ![AppVersion: 2021.11.0](https://img.shields.io/badge/AppVersion-2021.11.0-informational?style=flat-square) +![Version: 0.2.11](https://img.shields.io/badge/Version-0.2.11-informational?style=flat-square) ![AppVersion: 2021.11.0](https://img.shields.io/badge/AppVersion-2021.11.0-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.10: +To install the chart with the release name `my-release` at version 0.2.11: ```bash helm repo add rstudio https://helm.rstudio.com -helm install my-release rstudio/rstudio-connect --version=0.2.10 +helm install my-release rstudio/rstudio-connect --version=0.2.11 ``` ## Required Configuration From e4fef45b4b34307f8099ddac3d56abb984674683 Mon Sep 17 00:00:00 2001 From: Cole Arendt Date: Wed, 17 Nov 2021 16:36:02 -0500 Subject: [PATCH 06/17] make securityContext configurable --- charts/rstudio-connect/templates/deployment.yaml | 2 ++ charts/rstudio-connect/values.yaml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/charts/rstudio-connect/templates/deployment.yaml b/charts/rstudio-connect/templates/deployment.yaml index 8ad1d550..d4c59a42 100644 --- a/charts/rstudio-connect/templates/deployment.yaml +++ b/charts/rstudio-connect/templates/deployment.yaml @@ -78,6 +78,8 @@ spec: imagePullPolicy: "{{ .Values.image.imagePullPolicy }}" ports: - containerPort: 3939 + securityContext: + {{ toYaml .Values.securityContext | indent 4 }} volumeMounts: - name: rstudio-connect-config mountPath: "/etc/rstudio-connect/rstudio-connect.gcfg" diff --git a/charts/rstudio-connect/values.yaml b/charts/rstudio-connect/values.yaml index f809a87d..e11212de 100644 --- a/charts/rstudio-connect/values.yaml +++ b/charts/rstudio-connect/values.yaml @@ -106,6 +106,9 @@ license: # -- secret is an existing secret with a license file in it secret: false +securityContext: + privileged: true + prometheusExporter: # -- Whether the prometheus exporter sidecar should be enabled enabled: true From 9bf2f4d7edfa03a81a563abcda6024727779e4c2 Mon Sep 17 00:00:00 2001 From: Cole Arendt Date: Wed, 17 Nov 2021 16:36:29 -0500 Subject: [PATCH 07/17] add test launcher values without privileged: true --- charts/rstudio-connect/ci/launcher-values-advanced.yaml | 1 + charts/rstudio-connect/ci/launcher-values-advanced2.yaml | 1 + charts/rstudio-connect/ci/launcher-values.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/charts/rstudio-connect/ci/launcher-values-advanced.yaml b/charts/rstudio-connect/ci/launcher-values-advanced.yaml index 68d969b8..b067087c 100644 --- a/charts/rstudio-connect/ci/launcher-values-advanced.yaml +++ b/charts/rstudio-connect/ci/launcher-values-advanced.yaml @@ -2,6 +2,7 @@ rbac: create: true serviceAccount: create: true +securityContext: {} launcher: enabled: true customRuntimeYaml: diff --git a/charts/rstudio-connect/ci/launcher-values-advanced2.yaml b/charts/rstudio-connect/ci/launcher-values-advanced2.yaml index cafdd806..6706ab5f 100644 --- a/charts/rstudio-connect/ci/launcher-values-advanced2.yaml +++ b/charts/rstudio-connect/ci/launcher-values-advanced2.yaml @@ -2,6 +2,7 @@ rbac: create: true serviceAccount: create: true +securityContext: {} launcher: enabled: true customRuntimeYaml: | diff --git a/charts/rstudio-connect/ci/launcher-values.yaml b/charts/rstudio-connect/ci/launcher-values.yaml index b225cc01..36c92329 100644 --- a/charts/rstudio-connect/ci/launcher-values.yaml +++ b/charts/rstudio-connect/ci/launcher-values.yaml @@ -4,3 +4,4 @@ rbac: create: true launcher: enabled: true +securityContext: {} From 78bf90c71b2077c31bb961a4698a1747b0c921b1 Mon Sep 17 00:00:00 2001 From: Cole Arendt Date: Wed, 17 Nov 2021 16:37:37 -0500 Subject: [PATCH 08/17] Update charts/rstudio-connect/NEWS.md --- charts/rstudio-connect/NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rstudio-connect/NEWS.md b/charts/rstudio-connect/NEWS.md index fd90d6cb..e4d0b5bb 100644 --- a/charts/rstudio-connect/NEWS.md +++ b/charts/rstudio-connect/NEWS.md @@ -1,6 +1,6 @@ # 0.2.11 -- remove "privileged: true", which is not necessary for rstudio-connect server or sessions +- remove "privileged: true", which is no longer necessary for rstudio-connect server or sessions - location for RStudio Connect's KubernetesProfilesConfig file has changed from `/etc/rstudio/launcher.kubernetes.profiles.conf` to `/etc/rstudio-connect/launcher/launcher.kubernetes.profiles.conf` so as to not conflict with RStudio Workbench # 0.2.10 From bb78a24979addcadebf5659736a86f18fbf66ddf Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Wed, 17 Nov 2021 21:37:57 +0000 Subject: [PATCH 09/17] Update helm-docs and README.md --- charts/rstudio-connect/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/rstudio-connect/README.md b/charts/rstudio-connect/README.md index c930b1c7..f7c37ea4 100644 --- a/charts/rstudio-connect/README.md +++ b/charts/rstudio-connect/README.md @@ -113,6 +113,7 @@ The Helm `config` values are converted into the `rstudio-connect.gcfg` service c | replicas | int | `1` | The number of replica pods to maintain for this service | | resources.limits | object | `{"cpu":"2000m","enabled":false,"ephemeralStorage":"200Mi","memory":"2Gi"}` | Defines resource limits for the rstudio-connect pod | | resources.requests | object | `{"cpu":"100m","enabled":false,"ephemeralStorage":"100Mi","memory":"1Gi"}` | Defines resource requests for the rstudio-connect pod | +| securityContext.privileged | bool | `true` | | | service.annotations | object | `{}` | Annotations that will be added onto the service | | service.nodePort | bool | `false` | The nodePort to use when using service type NodePort. If not provided, Kubernetes will provide one automatically | | service.port | int | `80` | The port to use for the Connect service | From bbf419d8b96f2f993e6f55850cafc5527e22c8e3 Mon Sep 17 00:00:00 2001 From: Cole Arendt Date: Wed, 17 Nov 2021 16:40:04 -0500 Subject: [PATCH 10/17] update NEWS wording --- charts/rstudio-connect/NEWS.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/charts/rstudio-connect/NEWS.md b/charts/rstudio-connect/NEWS.md index e4d0b5bb..9c56abab 100644 --- a/charts/rstudio-connect/NEWS.md +++ b/charts/rstudio-connect/NEWS.md @@ -1,7 +1,12 @@ # 0.2.11 -- remove "privileged: true", which is no longer necessary for rstudio-connect server or sessions -- location for RStudio Connect's KubernetesProfilesConfig file has changed from `/etc/rstudio/launcher.kubernetes.profiles.conf` to `/etc/rstudio-connect/launcher/launcher.kubernetes.profiles.conf` so as to not conflict with RStudio Workbench +- move "privileged: true" into `values.yaml`, because it is no longer necessary + for rstudio-connect server or sessions when launcher is enabled. + - To disable when using the launcher, set `securityContext: {}` +- location for RStudio Connect's KubernetesProfilesConfig file has changed from + `/etc/rstudio/launcher.kubernetes.profiles.conf` to + `/etc/rstudio-connect/launcher/launcher.kubernetes.profiles.conf` so as to not + conflict with RStudio Workbench # 0.2.10 From 9df6ba6191e42b415f8e18f72b65b30b81869a6a Mon Sep 17 00:00:00 2001 From: Cole Arendt Date: Wed, 17 Nov 2021 16:41:47 -0500 Subject: [PATCH 11/17] update values note --- charts/rstudio-connect/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/rstudio-connect/values.yaml b/charts/rstudio-connect/values.yaml index e11212de..2130174a 100644 --- a/charts/rstudio-connect/values.yaml +++ b/charts/rstudio-connect/values.yaml @@ -106,6 +106,8 @@ license: # -- secret is an existing secret with a license file in it secret: false +# -- Values to set the `securityContext` for Connect pods. It must include "privileged: true" or "CAP_SYS_ADMIN" when +# launcher is not enabled. If launcher is enabled, this can be removed with `securityContext: {}` securityContext: privileged: true From 7c98a33626e94a7b6cab80cc5fb16f57dd287fae Mon Sep 17 00:00:00 2001 From: Cole Arendt Date: Wed, 17 Nov 2021 16:42:21 -0500 Subject: [PATCH 12/17] fix docs and wording / spacing --- charts/rstudio-connect/README.md | 2 +- charts/rstudio-connect/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/rstudio-connect/README.md b/charts/rstudio-connect/README.md index f7c37ea4..c2a7726d 100644 --- a/charts/rstudio-connect/README.md +++ b/charts/rstudio-connect/README.md @@ -113,7 +113,7 @@ The Helm `config` values are converted into the `rstudio-connect.gcfg` service c | replicas | int | `1` | The number of replica pods to maintain for this service | | resources.limits | object | `{"cpu":"2000m","enabled":false,"ephemeralStorage":"200Mi","memory":"2Gi"}` | Defines resource limits for the rstudio-connect pod | | resources.requests | object | `{"cpu":"100m","enabled":false,"ephemeralStorage":"100Mi","memory":"1Gi"}` | Defines resource requests for the rstudio-connect pod | -| securityContext.privileged | bool | `true` | | +| securityContext | object | `{"privileged":true}` | Values to set the `securityContext` for Connect pods. It must include "privileged: true" or "CAP_SYS_ADMIN" when launcher is not enabled. If launcher is enabled, this can be removed with `securityContext: {}` | | service.annotations | object | `{}` | Annotations that will be added onto the service | | service.nodePort | bool | `false` | The nodePort to use when using service type NodePort. If not provided, Kubernetes will provide one automatically | | service.port | int | `80` | The port to use for the Connect service | diff --git a/charts/rstudio-connect/values.yaml b/charts/rstudio-connect/values.yaml index 2130174a..d33b590c 100644 --- a/charts/rstudio-connect/values.yaml +++ b/charts/rstudio-connect/values.yaml @@ -107,7 +107,7 @@ license: secret: false # -- Values to set the `securityContext` for Connect pods. It must include "privileged: true" or "CAP_SYS_ADMIN" when -# launcher is not enabled. If launcher is enabled, this can be removed with `securityContext: {}` +# launcher is not enabled. If launcher is enabled, this can be removed with `securityContext: {}` securityContext: privileged: true From da77421c9c29c1108f59d0220a201c69298e0f6e Mon Sep 17 00:00:00 2001 From: Cole Arendt Date: Wed, 17 Nov 2021 16:44:36 -0500 Subject: [PATCH 13/17] fix indentation --- charts/rstudio-connect/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rstudio-connect/templates/deployment.yaml b/charts/rstudio-connect/templates/deployment.yaml index d4c59a42..a39428e6 100644 --- a/charts/rstudio-connect/templates/deployment.yaml +++ b/charts/rstudio-connect/templates/deployment.yaml @@ -79,7 +79,7 @@ spec: ports: - containerPort: 3939 securityContext: - {{ toYaml .Values.securityContext | indent 4 }} + {{ toYaml .Values.securityContext | indent 10 }} volumeMounts: - name: rstudio-connect-config mountPath: "/etc/rstudio-connect/rstudio-connect.gcfg" From c9a871e3ec8bb3c4b8ba21ab362581adbab31ce6 Mon Sep 17 00:00:00 2001 From: Cole Arendt Date: Thu, 18 Nov 2021 09:11:26 -0500 Subject: [PATCH 14/17] fix whitespace issue remove securityContext key when value is missing --- charts/rstudio-connect/templates/deployment.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/rstudio-connect/templates/deployment.yaml b/charts/rstudio-connect/templates/deployment.yaml index a39428e6..e9b7e3b5 100644 --- a/charts/rstudio-connect/templates/deployment.yaml +++ b/charts/rstudio-connect/templates/deployment.yaml @@ -78,8 +78,10 @@ spec: imagePullPolicy: "{{ .Values.image.imagePullPolicy }}" ports: - containerPort: 3939 + {{- with .Values.securityContext }} securityContext: - {{ toYaml .Values.securityContext | indent 10 }} + {{- toYaml . | nindent 10 }} + {{- end }} volumeMounts: - name: rstudio-connect-config mountPath: "/etc/rstudio-connect/rstudio-connect.gcfg" From 0ab410c13a476aa7eb7d8788cd3cd0a70160551f Mon Sep 17 00:00:00 2001 From: Cole Arendt Date: Thu, 18 Nov 2021 09:11:36 -0500 Subject: [PATCH 15/17] update news and values comment --- charts/rstudio-connect/NEWS.md | 3 ++- charts/rstudio-connect/values.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/rstudio-connect/NEWS.md b/charts/rstudio-connect/NEWS.md index 9c56abab..d88ab69f 100644 --- a/charts/rstudio-connect/NEWS.md +++ b/charts/rstudio-connect/NEWS.md @@ -2,7 +2,8 @@ - move "privileged: true" into `values.yaml`, because it is no longer necessary for rstudio-connect server or sessions when launcher is enabled. - - To disable when using the launcher, set `securityContext: {}` + - To disable when using the launcher, set `securityContext: null` + - NOTE: `securityContext: {}` will not remove the default, because helm values merge objects by default - location for RStudio Connect's KubernetesProfilesConfig file has changed from `/etc/rstudio/launcher.kubernetes.profiles.conf` to `/etc/rstudio-connect/launcher/launcher.kubernetes.profiles.conf` so as to not diff --git a/charts/rstudio-connect/values.yaml b/charts/rstudio-connect/values.yaml index d33b590c..2adca4a3 100644 --- a/charts/rstudio-connect/values.yaml +++ b/charts/rstudio-connect/values.yaml @@ -107,7 +107,7 @@ license: secret: false # -- Values to set the `securityContext` for Connect pods. It must include "privileged: true" or "CAP_SYS_ADMIN" when -# launcher is not enabled. If launcher is enabled, this can be removed with `securityContext: {}` +# launcher is not enabled. If launcher is enabled, this can be removed with `securityContext: null` securityContext: privileged: true From 3a87069dfc593e511648c91582a6d7758dfdc714 Mon Sep 17 00:00:00 2001 From: Cole Arendt Date: Thu, 18 Nov 2021 09:11:59 -0500 Subject: [PATCH 16/17] update readme --- charts/rstudio-connect/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rstudio-connect/README.md b/charts/rstudio-connect/README.md index c2a7726d..37fd6656 100644 --- a/charts/rstudio-connect/README.md +++ b/charts/rstudio-connect/README.md @@ -113,7 +113,7 @@ The Helm `config` values are converted into the `rstudio-connect.gcfg` service c | replicas | int | `1` | The number of replica pods to maintain for this service | | resources.limits | object | `{"cpu":"2000m","enabled":false,"ephemeralStorage":"200Mi","memory":"2Gi"}` | Defines resource limits for the rstudio-connect pod | | resources.requests | object | `{"cpu":"100m","enabled":false,"ephemeralStorage":"100Mi","memory":"1Gi"}` | Defines resource requests for the rstudio-connect pod | -| securityContext | object | `{"privileged":true}` | Values to set the `securityContext` for Connect pods. It must include "privileged: true" or "CAP_SYS_ADMIN" when launcher is not enabled. If launcher is enabled, this can be removed with `securityContext: {}` | +| securityContext | object | `{"privileged":true}` | Values to set the `securityContext` for Connect pods. It must include "privileged: true" or "CAP_SYS_ADMIN" when launcher is not enabled. If launcher is enabled, this can be removed with `securityContext: null` | | service.annotations | object | `{}` | Annotations that will be added onto the service | | service.nodePort | bool | `false` | The nodePort to use when using service type NodePort. If not provided, Kubernetes will provide one automatically | | service.port | int | `80` | The port to use for the Connect service | From 833977835da82500c66de540a91985e437ca1d2c Mon Sep 17 00:00:00 2001 From: Cole Arendt Date: Thu, 18 Nov 2021 09:13:40 -0500 Subject: [PATCH 17/17] disable privileged in launcher examples --- charts/rstudio-connect/ci/launcher-values-advanced.yaml | 2 +- charts/rstudio-connect/ci/launcher-values-advanced2.yaml | 2 +- charts/rstudio-connect/ci/launcher-values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/rstudio-connect/ci/launcher-values-advanced.yaml b/charts/rstudio-connect/ci/launcher-values-advanced.yaml index b067087c..4dbeb6d8 100644 --- a/charts/rstudio-connect/ci/launcher-values-advanced.yaml +++ b/charts/rstudio-connect/ci/launcher-values-advanced.yaml @@ -2,7 +2,7 @@ rbac: create: true serviceAccount: create: true -securityContext: {} +securityContext: null launcher: enabled: true customRuntimeYaml: diff --git a/charts/rstudio-connect/ci/launcher-values-advanced2.yaml b/charts/rstudio-connect/ci/launcher-values-advanced2.yaml index 6706ab5f..094acff1 100644 --- a/charts/rstudio-connect/ci/launcher-values-advanced2.yaml +++ b/charts/rstudio-connect/ci/launcher-values-advanced2.yaml @@ -2,7 +2,7 @@ rbac: create: true serviceAccount: create: true -securityContext: {} +securityContext: null launcher: enabled: true customRuntimeYaml: | diff --git a/charts/rstudio-connect/ci/launcher-values.yaml b/charts/rstudio-connect/ci/launcher-values.yaml index 36c92329..9b273a87 100644 --- a/charts/rstudio-connect/ci/launcher-values.yaml +++ b/charts/rstudio-connect/ci/launcher-values.yaml @@ -4,4 +4,4 @@ rbac: create: true launcher: enabled: true -securityContext: {} +securityContext: null