diff --git a/charts/rstudio-connect/Chart.lock b/charts/rstudio-connect/Chart.lock index fba47055..2158d987 100644 --- 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.25 -digest: sha256:08346f2e681bf03d2dea6d8f9538f15f2396d2bd09da95543ab788bed98e52db -generated: "2023-03-17T14:57:23.683599-04:00" + version: 0.1.26 +digest: sha256:a44e6522d87fad58a52c147c0f46684f14934b392df1a9fd195e284b978ec378 +generated: "2023-07-21T10:31:31.079888-04:00" diff --git a/charts/rstudio-connect/Chart.yaml b/charts/rstudio-connect/Chart.yaml index 7cc2a854..c1c4d75f 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.5.2 +version: 0.5.3 apiVersion: v2 appVersion: 2023.06.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.25 + version: 0.1.26 repository: file://../rstudio-library annotations: artifacthub.io/images: | diff --git a/charts/rstudio-connect/README.md b/charts/rstudio-connect/README.md index 5d87d7cc..64de68a7 100644 --- a/charts/rstudio-connect/README.md +++ b/charts/rstudio-connect/README.md @@ -1,6 +1,6 @@ # RStudio Connect -![Version: 0.5.2](https://img.shields.io/badge/Version-0.5.2-informational?style=flat-square) ![AppVersion: 2023.06.0](https://img.shields.io/badge/AppVersion-2023.06.0-informational?style=flat-square) +![Version: 0.5.3](https://img.shields.io/badge/Version-0.5.3-informational?style=flat-square) ![AppVersion: 2023.06.0](https://img.shields.io/badge/AppVersion-2023.06.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.2: +To install the chart with the release name `my-release` at version 0.5.3: ```bash helm repo add rstudio https://helm.rstudio.com -helm upgrade --install my-release rstudio/rstudio-connect --version=0.5.2 +helm upgrade --install my-release rstudio/rstudio-connect --version=0.5.3 ``` To explore other chart versions, take a look at: @@ -153,7 +153,7 @@ The Helm `config` values are converted into the `rstudio-connect.gcfg` service c | prometheusExporter.securityContext | object | `{}` | securityContext for the prometheus exporter sidecar | | rbac.clusterRoleCreate | bool | `false` | Whether to create the ClusterRole that grants access to the Kubernetes nodes API. This is used by the Launcher to get all of the IP addresses associated with the node that is running a particular job. In most cases, this can be disabled as the node's internal address is sufficient to allow proper functionality. | | rbac.create | bool | `true` | Whether to create rbac. (also depends on launcher.enabled = true) | -| rbac.serviceAccount | object | `{"annotations":{},"create":true,"name":""}` | The serviceAccount to be associated with rbac (also depends on launcher.enabled = true) | +| rbac.serviceAccount | object | `{"annotations":{},"create":true,"labels":{},"name":""}` | The serviceAccount to be associated with rbac (also depends on launcher.enabled = true) | | readinessProbe | object | `{"enabled":true,"failureThreshold":3,"httpGet":{"path":"/__ping__","port":3939},"initialDelaySeconds":3,"periodSeconds":3,"successThreshold":1,"timeoutSeconds":1}` | Used to configure the container's readinessProbe. Only included if enabled = true | | replicas | int | `1` | The number of replica pods to maintain for this service | | resources | object | `{}` | Defines resources for the rstudio-connect container | diff --git a/charts/rstudio-connect/templates/rbac.yaml b/charts/rstudio-connect/templates/rbac.yaml index 7e8d5902..acd31626 100644 --- a/charts/rstudio-connect/templates/rbac.yaml +++ b/charts/rstudio-connect/templates/rbac.yaml @@ -4,9 +4,10 @@ {{ $serviceAccountName := default .Values.rbac.serviceAccount.name (include "rstudio-connect.fullname" .) }} {{ $serviceAccountCreate := .Values.rbac.serviceAccount.create }} {{ $serviceAccountAnnotations := .Values.rbac.serviceAccount.annotations }} +{{ $serviceAccountLabels := .Values.rbac.serviceAccount.labels }} {{ $clusterRoleCreate := .Values.rbac.clusterRoleCreate }} {{ $rbacValues1 := dict "namespace" $namespace "serviceAccountName" $serviceAccountName "targetNamespace" $targetNamespace }} -{{ $rbacValues2 := dict "serviceAccountCreate" $serviceAccountCreate "serviceAccountAnnotations" $serviceAccountAnnotations }} +{{ $rbacValues2 := dict "serviceAccountCreate" $serviceAccountCreate "serviceAccountAnnotations" $serviceAccountAnnotations "serviceAccountLabels" $serviceAccountLabels }} {{ $rbacValues3 := dict "clusterRoleCreate" $clusterRoleCreate }} {{ $rbacValues := merge $rbacValues1 $rbacValues2 $rbacValues3 }} {{ include "rstudio-library.rbac" $rbacValues }} diff --git a/charts/rstudio-connect/values.yaml b/charts/rstudio-connect/values.yaml index efb75f0f..0e7e3441 100644 --- a/charts/rstudio-connect/values.yaml +++ b/charts/rstudio-connect/values.yaml @@ -45,6 +45,7 @@ rbac: create: true name: "" annotations: {} + labels: {} # -- Extra objects to deploy (value evaluated as a template) extraObjects: [] diff --git a/charts/rstudio-launcher-rbac/Chart.lock b/charts/rstudio-launcher-rbac/Chart.lock index 5da234c3..bc4ac73a 100644 --- 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.25 -digest: sha256:08346f2e681bf03d2dea6d8f9538f15f2396d2bd09da95543ab788bed98e52db -generated: "2023-03-17T14:57:25.394196-04:00" + version: 0.1.26 +digest: sha256:a44e6522d87fad58a52c147c0f46684f14934b392df1a9fd195e284b978ec378 +generated: "2023-07-21T12:24:53.177096-04:00" diff --git a/charts/rstudio-launcher-rbac/Chart.yaml b/charts/rstudio-launcher-rbac/Chart.yaml index 25469f56..fb90d66f 100644 --- 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.16 -appVersion: 0.2.16 +version: 0.2.17 +appVersion: 0.2.17 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.25 + version: 0.1.26 repository: file://../rstudio-library keywords: - "data science" diff --git a/charts/rstudio-launcher-rbac/NEWS.md b/charts/rstudio-launcher-rbac/NEWS.md index 802de8bc..396fb900 100644 --- a/charts/rstudio-launcher-rbac/NEWS.md +++ b/charts/rstudio-launcher-rbac/NEWS.md @@ -1,3 +1,8 @@ +# 0.2.17 + +- Update `rstudio-library` chart dependency +- Add the ability to add serviceAccount labels + # 0.2.16 - Update documentation for more clarity diff --git a/charts/rstudio-launcher-rbac/README.md b/charts/rstudio-launcher-rbac/README.md index 1c760e89..7f6aa6e2 100644 --- a/charts/rstudio-launcher-rbac/README.md +++ b/charts/rstudio-launcher-rbac/README.md @@ -1,6 +1,6 @@ # rstudio-launcher-rbac -![Version: 0.2.16](https://img.shields.io/badge/Version-0.2.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.16](https://img.shields.io/badge/AppVersion-0.2.16-informational?style=flat-square) +![Version: 0.2.17](https://img.shields.io/badge/Version-0.2.17-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.17](https://img.shields.io/badge/AppVersion-0.2.17-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.16: +To install the chart with the release name `my-release` at version 0.2.17: ```bash helm repo add rstudio https://helm.rstudio.com -helm upgrade --install my-release rstudio/rstudio-launcher-rbac --version=0.2.16 +helm upgrade --install my-release rstudio/rstudio-launcher-rbac --version=0.2.17 ``` To explore other chart versions, take a look at: @@ -51,9 +51,10 @@ helm template -n rstudio rstudio-launcher-rbac rstudio/rstudio-launcher-rbac | includeReleaseNamespace | bool | `true` | Whether the helm release namespace should be a possible launcher target | | nameOverride | string | `""` | The override for "ChartName" in the "FullName" which defaults to "ReleaseName-ChartName" or "ReleaseName" (if "ReleaseName" contains "ChartName") | | removeNamespaceReferences | bool | `false` | remove explicit namespace references (problematic if targetNamespaces is defined) | -| serviceAccount.annotations | object | `{}` | | -| serviceAccount.create | bool | `true` | | -| serviceAccount.name | string | `""` | | +| serviceAccount.annotations | object | `{}` | Annotations to add to the service account | +| serviceAccount.create | bool | `true` | Specifies whether a service account should be created | +| serviceAccount.labels | object | `{}` | Labels to add to the service account | +| serviceAccount.name | string | `""` | The name of the service account to use. If not set, a name is generated using the fullname template | | targetNamespaces | list | `[]` | The targetNamespaces that the launcher will be able to launch sessions into | ---------------------------------------------- diff --git a/charts/rstudio-launcher-rbac/templates/rbac.yaml b/charts/rstudio-launcher-rbac/templates/rbac.yaml index 15b1f3be..1415f898 100644 --- a/charts/rstudio-launcher-rbac/templates/rbac.yaml +++ b/charts/rstudio-launcher-rbac/templates/rbac.yaml @@ -17,6 +17,7 @@ {{- $roleName := include "rstudio-launcher-rbac.fullname" . }} {{- $serviceAccountCreate := .Values.serviceAccount.create }} {{- $serviceAccountAnnotations := .Values.serviceAccount.annotations }} +{{- $serviceAccountLabels := .Values.serviceAccount.labels }} {{- $clusterRoleCreate := .Values.clusterRoleCreate }} {{- $rbacValues := dict @@ -25,6 +26,7 @@ "targetNamespace" ($targetNamespace) "serviceAccountCreate" ($serviceAccountCreate) "serviceAccountAnnotations" ($serviceAccountAnnotations) + "serviceAccountLabels" ($serviceAccountLabels) "removeNamespaceReferences" (.Values.removeNamespaceReferences) "roleName" ($roleName) "clusterRoleCreate" ($clusterRoleCreate) diff --git a/charts/rstudio-launcher-rbac/values.yaml b/charts/rstudio-launcher-rbac/values.yaml index 43dec850..08cb7b26 100644 --- a/charts/rstudio-launcher-rbac/values.yaml +++ b/charts/rstudio-launcher-rbac/values.yaml @@ -18,10 +18,12 @@ fullnameOverride: "" clusterRoleCreate: false serviceAccount: - # Specifies whether a service account should be created + # -- Specifies whether a service account should be created create: true - # Annotations to add to the service account + # -- Annotations to add to the service account annotations: {} - # The name of the service account to use. + # -- The name of the service account to use. # If not set, a name is generated using the fullname template name: "" + # -- Labels to add to the service account + labels: {} diff --git a/charts/rstudio-library/Chart.yaml b/charts/rstudio-library/Chart.yaml index 5435f1ee..3d3a9d7f 100644 --- 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.25 -appVersion: 0.1.25 +version: 0.1.26 +appVersion: 0.1.26 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 index a40ed81d..ca100b73 100644 --- a/charts/rstudio-library/NEWS.md +++ b/charts/rstudio-library/NEWS.md @@ -1,3 +1,7 @@ +# 0.1.26 + +- Add the capability to add labels to service accounts + # 0.1.25 - Update documentation to remove "beta" label and explain production recommendations diff --git a/charts/rstudio-library/README.md b/charts/rstudio-library/README.md index 495621f0..2b634c5a 100644 --- a/charts/rstudio-library/README.md +++ b/charts/rstudio-library/README.md @@ -1,6 +1,6 @@ # rstudio-library -![Version: 0.1.25](https://img.shields.io/badge/Version-0.1.25-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: 0.1.25](https://img.shields.io/badge/AppVersion-0.1.25-informational?style=flat-square) +![Version: 0.1.26](https://img.shields.io/badge/Version-0.1.26-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: 0.1.26](https://img.shields.io/badge/AppVersion-0.1.26-informational?style=flat-square) #### _Helm library helpers for use by Official RStudio charts_ diff --git a/charts/rstudio-library/templates/_rbac.tpl b/charts/rstudio-library/templates/_rbac.tpl index be54b08f..7f393022 100644 --- a/charts/rstudio-library/templates/_rbac.tpl +++ b/charts/rstudio-library/templates/_rbac.tpl @@ -8,10 +8,12 @@ "removeNamespaceReferences": "whether to remove namespace references" "serviceAccountCreate": "whether to create the service account" "serviceAccountAnnotations": "annotation object for the serviceAccount" + "serviceAccountLabels": "labels object for the serviceAccount" "clusterRoleCreate": "whether or not to create the ClusterRole that allows access to the nodes API" */ -}} {{- define "rstudio-library.rbac" -}} {{- $serviceAccountAnnotations := default (dict) .serviceAccountAnnotations }} +{{- $serviceAccountLabels := default (dict) .serviceAccountLabels }} {{- include "rstudio-library.debug.type-check" (dict "name" "serviceAccountCreate" "object" .serviceAccountCreate "expected" "bool" "description" "enabling cluster service account creation") }} {{- $serviceAccountCreate := eq .serviceAccountCreate false | ternary false true }} {{- $serviceAccountName := .serviceAccountName }} @@ -63,6 +65,10 @@ metadata: annotations: {{- toYaml . | nindent 4 }} {{- end }} + {{- with $serviceAccountLabels }} + labels: + {{- toYaml . | nindent 4 }} + {{- end }} {{- end }} {{- range $ns := $allNamespaces }} --- diff --git a/charts/rstudio-pm/Chart.lock b/charts/rstudio-pm/Chart.lock index 79b377b6..a2ed8704 100644 --- 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.25 -digest: sha256:08346f2e681bf03d2dea6d8f9538f15f2396d2bd09da95543ab788bed98e52db -generated: "2023-03-17T14:57:27.445424-04:00" + version: 0.1.26 +digest: sha256:a44e6522d87fad58a52c147c0f46684f14934b392df1a9fd195e284b978ec378 +generated: "2023-07-21T12:24:55.582151-04:00" diff --git a/charts/rstudio-pm/Chart.yaml b/charts/rstudio-pm/Chart.yaml index ae845db0..4ce1995e 100644 --- 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.5.11 +version: 0.5.12 apiVersion: v2 appVersion: 2023.04.0 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.25 + version: 0.1.26 repository: file://../rstudio-library annotations: artifacthub.io/images: | diff --git a/charts/rstudio-pm/README.md b/charts/rstudio-pm/README.md index a545118b..a3dacc35 100644 --- a/charts/rstudio-pm/README.md +++ b/charts/rstudio-pm/README.md @@ -1,6 +1,6 @@ # RStudio Package Manager -![Version: 0.5.11](https://img.shields.io/badge/Version-0.5.11-informational?style=flat-square) ![AppVersion: 2023.04.0](https://img.shields.io/badge/AppVersion-2023.04.0-informational?style=flat-square) +![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) #### _Official Helm chart for RStudio Package Manager_ @@ -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.11: +To install the chart with the release name `my-release` at version 0.5.12: ```bash helm repo add rstudio https://helm.rstudio.com -helm upgrade --install my-release rstudio/rstudio-pm --version=0.5.11 +helm upgrade --install my-release rstudio/rstudio-pm --version=0.5.12 ``` To explore other chart versions, take a look at: @@ -173,6 +173,7 @@ The Helm `config` values are converted into the `rstudio-pm.gcfg` service config | service.type | string | `"ClusterIP"` | The service type, usually ClusterIP (in-cluster only) or LoadBalancer (to expose the service using your cloud provider's load balancer) | | serviceAccount.annotations | object | `{}` | Annotations for the ServiceAccount, if any | | serviceAccount.create | bool | `true` | Whether to create a [Service Account](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) | +| serviceAccount.labels | object | `{}` | | | serviceAccount.name | string | When `serviceAccount.create` is `true` this defaults to the full name of the release | ServiceAccount to use, if any, or an explicit name for the one we create | | serviceMonitor.additionalLabels | object | `{}` | additionalLabels normally includes the release name of the Prometheus Operator | | serviceMonitor.enabled | bool | `false` | Whether to create a ServiceMonitor CRD for use with a Prometheus Operator | diff --git a/charts/rstudio-pm/values.yaml b/charts/rstudio-pm/values.yaml index 4616f965..eef939de 100644 --- a/charts/rstudio-pm/values.yaml +++ b/charts/rstudio-pm/values.yaml @@ -213,6 +213,8 @@ serviceAccount: # -- Annotations for the ServiceAccount, if any annotations: {} # eks.amazonaws.com/role-arn: arn:aws:iam::123456789000:role/iam-role-name-here + # -- Labels for the ServiceAccount, if any + labels: {} serviceMonitor: # -- Whether to create a ServiceMonitor CRD for use with a Prometheus Operator diff --git a/charts/rstudio-workbench/Chart.lock b/charts/rstudio-workbench/Chart.lock index 6b157de0..f85e68b0 100644 --- 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.25 -digest: sha256:08346f2e681bf03d2dea6d8f9538f15f2396d2bd09da95543ab788bed98e52db -generated: "2023-03-17T14:57:29.304822-04:00" + version: 0.1.26 +digest: sha256:a44e6522d87fad58a52c147c0f46684f14934b392df1a9fd195e284b978ec378 +generated: "2023-07-21T12:24:58.270579-04:00" diff --git a/charts/rstudio-workbench/Chart.yaml b/charts/rstudio-workbench/Chart.yaml index 7b3211f9..134d2f9b 100644 --- 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.6.3 +version: 0.6.4 apiVersion: v2 appVersion: 2023.06.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.25 + version: 0.1.26 repository: file://../rstudio-library annotations: artifacthub.io/images: | diff --git a/charts/rstudio-workbench/README.md b/charts/rstudio-workbench/README.md index a1f8cb4f..d88113ba 100644 --- a/charts/rstudio-workbench/README.md +++ b/charts/rstudio-workbench/README.md @@ -1,6 +1,6 @@ # RStudio Workbench -![Version: 0.6.3](https://img.shields.io/badge/Version-0.6.3-informational?style=flat-square) ![AppVersion: 2023.06.0](https://img.shields.io/badge/AppVersion-2023.06.0-informational?style=flat-square) +![Version: 0.6.4](https://img.shields.io/badge/Version-0.6.4-informational?style=flat-square) ![AppVersion: 2023.06.0](https://img.shields.io/badge/AppVersion-2023.06.0-informational?style=flat-square) #### _Official Helm chart for RStudio Workbench_ @@ -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.3: +To install the chart with the release name `my-release` at version 0.6.4: ```bash helm repo add rstudio https://helm.rstudio.com -helm upgrade --install my-release rstudio/rstudio-workbench --version=0.6.3 +helm upgrade --install my-release rstudio/rstudio-workbench --version=0.6.4 ``` To explore other chart versions, take a look at: @@ -451,7 +451,7 @@ Use of [Sealed Secrets](https://github.com/bitnami-labs/sealed-secrets) disables | prometheusExporter.securityContext | object | `{}` | securityContext for the prometheus exporter sidecar | | rbac.clusterRoleCreate | bool | `false` | Whether to create the ClusterRole that grants access to the Kubernetes nodes API. This is used by the Launcher to get all of the IP addresses associated with the node that is running a particular job. In most cases, this can be disabled as the node's internal address is sufficient to allow proper functionality. | | rbac.create | bool | `true` | Whether to create rbac. (also depends on launcher.enabled = true) | -| rbac.serviceAccount | object | `{"annotations":{},"create":true,"name":""}` | The serviceAccount to be associated with rbac (also depends on launcher.enabled = true) | +| rbac.serviceAccount | object | `{"annotations":{},"create":true,"labels":{},"name":""}` | The serviceAccount to be associated with rbac (also depends on launcher.enabled = true) | | readinessProbe | object | `{"enabled":true,"failureThreshold":3,"httpGet":{"path":"/health-check","port":8787},"initialDelaySeconds":3,"periodSeconds":3,"successThreshold":1,"timeoutSeconds":1}` | readinessProbe is used to configure the container's readinessProbe | | replicas | int | `1` | replicas is the number of replica pods to maintain for this service. Use 2 or more to enable HA | | resources | object | `{"limits":{"cpu":"2000m","enabled":false,"ephemeralStorage":"200Mi","memory":"4Gi"},"requests":{"cpu":"100m","enabled":false,"ephemeralStorage":"100Mi","memory":"2Gi"}}` | resources define requests and limits for the rstudio-server pod | diff --git a/charts/rstudio-workbench/templates/rbac.yaml b/charts/rstudio-workbench/templates/rbac.yaml index c8baada4..16154f50 100644 --- a/charts/rstudio-workbench/templates/rbac.yaml +++ b/charts/rstudio-workbench/templates/rbac.yaml @@ -5,9 +5,10 @@ {{- $serviceAccountCreate := .Values.rbac.serviceAccount.create }} {{- $roleName := $serviceAccountName }} {{- $serviceAccountAnnotations := .Values.rbac.serviceAccount.annotations }} +{{- $serviceAccountLabels := .Values.rbac.serviceAccount.labels }} {{- $clusterRoleCreate := .Values.rbac.clusterRoleCreate }} {{- $rbacValues1 := dict "namespace" $namespace "serviceAccountName" $serviceAccountName "targetNamespace" $targetNamespace }} -{{- $rbacValues2 := dict "serviceAccountCreate" $serviceAccountCreate "serviceAccountAnnotations" $serviceAccountAnnotations "roleName" ($roleName) }} +{{- $rbacValues2 := dict "serviceAccountCreate" $serviceAccountCreate "serviceAccountAnnotations" $serviceAccountAnnotations "serviceAccountLabels" $serviceAccountLabels "roleName" ($roleName) }} {{- $rbacValues3 := dict "clusterRoleCreate" $clusterRoleCreate }} {{- $rbacValues := merge $rbacValues1 $rbacValues2 $rbacValues3 }} {{- include "rstudio-library.rbac" $rbacValues }} diff --git a/charts/rstudio-workbench/values.yaml b/charts/rstudio-workbench/values.yaml index 7f9610d6..2785020b 100644 --- a/charts/rstudio-workbench/values.yaml +++ b/charts/rstudio-workbench/values.yaml @@ -342,6 +342,7 @@ rbac: create: true name: "" annotations: {} + labels: {} # -- Whether to create the ClusterRole that grants access to the Kubernetes nodes API. This is used by the Launcher # to get all of the IP addresses associated with the node that is running a particular job. In most cases, this can # be disabled as the node's internal address is sufficient to allow proper functionality.