Merge pull request #593 from rstudio/kegs-fix-launcher-service-account

Fix connect pod service account values when launcher is enabled
rstudio · Oct 28, 2024 · 884427b · 884427b
2 parents 24867fb + 2282a6f
commit 884427b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
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 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
@@ -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

diff --git 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:

diff --git 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
@@ -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 }}

diff --git 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