From 03c4bbf8eb35d1c12da05daed6451fcfa75469c2 Mon Sep 17 00:00:00 2001 From: David Kegley Date: Tue, 22 Oct 2024 10:31:20 -0400 Subject: [PATCH 1/4] Fix Connect pod service account override when launcher is enabled --- charts/rstudio-connect/templates/deployment.yaml | 2 +- charts/rstudio-connect/templates/rbac.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/rstudio-connect/templates/deployment.yaml b/charts/rstudio-connect/templates/deployment.yaml index 7b8bd460..e5b9a625 100644 --- a/charts/rstudio-connect/templates/deployment.yaml +++ b/charts/rstudio-connect/templates/deployment.yaml @@ -77,7 +77,7 @@ spec: * https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-multiple-service-accounts */}} {{- if and .Values.rbac.create .Values.launcher.enabled }} - {{ $serviceAccountName := default (default .Values.rbac.serviceAccount.name .Values.pod.serviceAccountName) (include "rstudio-connect.fullname" .) }} + {{ $serviceAccountName := default (include "rstudio-connect.fullname" .) .Values.rbac.serviceAccount.name }} serviceAccountName: {{ $serviceAccountName }} {{- else }} serviceAccountName: {{ .Values.rbac.serviceAccount.name | toString | quote }} diff --git a/charts/rstudio-connect/templates/rbac.yaml b/charts/rstudio-connect/templates/rbac.yaml index acd31626..bfb25325 100644 --- a/charts/rstudio-connect/templates/rbac.yaml +++ b/charts/rstudio-connect/templates/rbac.yaml @@ -1,7 +1,7 @@ {{- if and (.Values.rbac.create) (.Values.launcher.enabled) }} {{ $namespace := $.Release.Namespace }} {{ $targetNamespace := default $.Release.Namespace .Values.launcher.namespace }} -{{ $serviceAccountName := default .Values.rbac.serviceAccount.name (include "rstudio-connect.fullname" .) }} +{{ $serviceAccountName := default (include "rstudio-connect.fullname" .) .Values.rbac.serviceAccount.name }} {{ $serviceAccountCreate := .Values.rbac.serviceAccount.create }} {{ $serviceAccountAnnotations := .Values.rbac.serviceAccount.annotations }} {{ $serviceAccountLabels := .Values.rbac.serviceAccount.labels }} From 82a5fbf726598c54698ca3fac07b8c424a970ef1 Mon Sep 17 00:00:00 2001 From: David Kegley Date: Tue, 22 Oct 2024 10:33:12 -0400 Subject: [PATCH 2/4] Bump Connect chart version --- charts/rstudio-connect/Chart.yaml | 2 +- charts/rstudio-connect/NEWS.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/rstudio-connect/Chart.yaml b/charts/rstudio-connect/Chart.yaml index 2c500037..14b4ec2e 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 Posit Connect -version: 0.7.11 +version: 0.7.12 apiVersion: v2 appVersion: 2024.09.0 icon: https://rstudio.com/wp-content/uploads/2018/10/RStudio-Logo-Flat.png diff --git a/charts/rstudio-connect/NEWS.md b/charts/rstudio-connect/NEWS.md index 0de635c4..a90e0d6e 100644 --- a/charts/rstudio-connect/NEWS.md +++ b/charts/rstudio-connect/NEWS.md @@ -1,5 +1,9 @@ # Changelog +## 0.7.12 + +- Fix a bug where `rbac.serviceAccount.name` was not applied when the job launcher is enabled. + ## 0.7.11 - Move the values files for linting and installation testing outside the chart directory so that we can iterate on them without releasing a new version of the chart From ce168650c985714e4c09476ec8dec2c603fb4d05 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Tue, 22 Oct 2024 14:34:45 +0000 Subject: [PATCH 3/4] 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 68890be2..8ea201a6 100644 --- a/charts/rstudio-connect/README.md +++ b/charts/rstudio-connect/README.md @@ -1,6 +1,6 @@ # Posit Connect -![Version: 0.7.11](https://img.shields.io/badge/Version-0.7.11-informational?style=flat-square) ![AppVersion: 2024.09.0](https://img.shields.io/badge/AppVersion-2024.09.0-informational?style=flat-square) +![Version: 0.7.12](https://img.shields.io/badge/Version-0.7.12-informational?style=flat-square) ![AppVersion: 2024.09.0](https://img.shields.io/badge/AppVersion-2024.09.0-informational?style=flat-square) #### _Official Helm chart for Posit Connect_ @@ -30,11 +30,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.7.11: +To install the chart with the release name `my-release` at version 0.7.12: ```{.bash} helm repo add rstudio https://helm.rstudio.com -helm upgrade --install my-release rstudio/rstudio-connect --version=0.7.11 +helm upgrade --install my-release rstudio/rstudio-connect --version=0.7.12 ``` To explore other chart versions, look at: From 957e2557ce814459756dbcbbb43b9a2f1872c802 Mon Sep 17 00:00:00 2001 From: David Kegley Date: Wed, 23 Oct 2024 16:24:40 -0400 Subject: [PATCH 4/4] Add connect pod service account to lint values --- ci/rstudio-connect/lint/launcher-advanced-values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/rstudio-connect/lint/launcher-advanced-values.yaml b/ci/rstudio-connect/lint/launcher-advanced-values.yaml index 5318e6d6..014df573 100644 --- a/ci/rstudio-connect/lint/launcher-advanced-values.yaml +++ b/ci/rstudio-connect/lint/launcher-advanced-values.yaml @@ -2,6 +2,7 @@ rbac: create: true serviceAccount: create: true + name: "connect-service-account" securityContext: null sharedStorage: create: true