Merge branch 'master' into release-1.11

astronomer · Sep 16, 2024 · 978e4e2 · 978e4e2
2 parents 4a26b48 + a4a3cf3
commit 978e4e2
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 11 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -1,7 +1,7 @@
 # apiVersion v2 is Helm 3
 apiVersion: v2
 name: airflow
-version: 1.11.6
+version: 1.11.7
 description: Helm chart to deploy the Astronomer Platform Airflow module
 icon: https://airflow.apache.org/docs/apache-airflow/stable/_images/pin_large.png
 keywords:

diff --git a/templates/_helpers.yaml b/templates/_helpers.yaml
@@ -169,7 +169,7 @@ Create the name of the webserver service account to use
 */}}
 {{- define "astro.webserver.serviceAccountName" -}}
 {{- if .Values.airflow.webserver.serviceAccount.create -}}
-    {{ default (printf "%s-webserver" (include "airflow.fullname" .)) .Values.airflow.webserver.serviceAccount.name }}
+    {{ default (printf "%s-webserver" (include "airflow.serviceAccountName" .)) .Values.airflow.webserver.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.airflow.webserver.serviceAccount.name }}
 {{- end -}}
@@ -180,7 +180,7 @@ Create the name of the redis service account to use
 */}}
 {{- define "astro.redis.serviceAccountName" -}}
 {{- if .Values.airflow.redis.serviceAccount.create -}}
-    {{ default (printf "%s-redis" (include "airflow.fullname" .)) .Values.airflow.redis.serviceAccount.name }}
+    {{ default (printf "%s-redis" (include "airflow.serviceAccountName" .)) .Values.airflow.redis.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.airflow.redis.serviceAccount.name }}
 {{- end -}}
@@ -191,7 +191,7 @@ Create the name of the flower service account to use
 */}}
 {{- define "astro.flower.serviceAccountName" -}}
 {{- if .Values.airflow.flower.serviceAccount.create -}}
-    {{ default (printf "%s-flower" (include "airflow.fullname" .)) .Values.airflow.flower.serviceAccount.name }}
+    {{ default (printf "%s-flower" (include "airflow.serviceAccountName" .)) .Values.airflow.flower.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.airflow.flower.serviceAccount.name }}
 {{- end -}}
@@ -202,7 +202,7 @@ Create the name of the scheduler service account to use
 */}}
 {{- define "astro.scheduler.serviceAccountName" -}}
 {{- if .Values.airflow.scheduler.serviceAccount.create -}}
-    {{ default (printf "%s-scheduler" (include "airflow.fullname" .)) .Values.airflow.scheduler.serviceAccount.name }}
+    {{ default (printf "%s-scheduler" (include "airflow.serviceAccountName" .)) .Values.airflow.scheduler.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.airflow.scheduler.serviceAccount.name }}
 {{- end -}}
@@ -213,7 +213,7 @@ Create the name of the statsd service account to use
 */}}
 {{- define "astro.statsd.serviceAccountName" -}}
 {{- if .Values.airflow.statsd.serviceAccount.create -}}
-    {{ default (printf "%s-statsd" (include "airflow.fullname" .)) .Values.airflow.statsd.serviceAccount.name }}
+    {{ default (printf "%s-statsd" (include "airflow.serviceAccountName" .)) .Values.airflow.statsd.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.airflow.statsd.serviceAccount.name }}
 {{- end -}}
@@ -224,7 +224,7 @@ Create the name of the create user job service account to use
 */}}
 {{- define "astro.createUserJob.serviceAccountName" -}}
 {{- if .Values.airflow.createUserJob.serviceAccount.create -}}
-    {{ default (printf "%s-create-user-job" (include "airflow.fullname" .)) .Values.airflow.createUserJob.serviceAccount.name }}
+    {{ default (printf "%s-create-user-job" (include "airflow.serviceAccountName" .)) .Values.airflow.createUserJob.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.airflow.createUserJob.serviceAccount.name }}
 {{- end -}}
@@ -235,7 +235,7 @@ Create the name of the migrate database job service account to use
 */}}
 {{- define "astro.migrateDatabaseJob.serviceAccountName" -}}
 {{- if .Values.airflow.migrateDatabaseJob.serviceAccount.create -}}
-    {{ default (printf "%s-migrate-database-job" (include "airflow.fullname" .)) .Values.airflow.migrateDatabaseJob.serviceAccount.name }}
+    {{ default (printf "%s-migrate-database-job" (include "airflow.serviceAccountName" .)) .Values.airflow.migrateDatabaseJob.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.airflow.migrateDatabaseJob.serviceAccount.name }}
 {{- end -}}
@@ -246,7 +246,7 @@ Create the name of the worker service account to use
 */}}
 {{- define "astro.worker.serviceAccountName" -}}
 {{- if .Values.airflow.workers.serviceAccount.create -}}
-    {{ default (printf "%s-worker" (include "airflow.fullname" .)) .Values.airflow.workers.serviceAccount.name }}
+    {{ default (printf "%s-worker" (include "airflow.serviceAccountName" .)) .Values.airflow.workers.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.airflow.workers.serviceAccount.name }}
 {{- end -}}
@@ -257,7 +257,7 @@ Create the name of the triggerer service account to use
 */}}
 {{- define "astro.triggerer.serviceAccountName" -}}
 {{- if .Values.airflow.triggerer.serviceAccount.create -}}
-    {{ default (printf "%s-triggerer" (include "airflow.fullname" .)) .Values.airflow.triggerer.serviceAccount.name }}
+    {{ default (printf "%s-triggerer" (include "airflow.serviceAccountName" .)) .Values.airflow.triggerer.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.airflow.triggerer.serviceAccount.name }}
 {{- end -}}
@@ -279,7 +279,7 @@ Create the name of the cleanup service account to use
 */}}
 {{- define "astro.cleanup.serviceAccountName" -}}
 {{- if .Values.airflow.cleanup.serviceAccount.create -}}
-    {{ default (printf "%s-cleanup" (include "airflow.fullname" .)) .Values.airflow.cleanup.serviceAccount.name }}
+    {{ default (printf "%s-cleanup" (include "airflow.serviceAccountName" .)) .Values.airflow.cleanup.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.airflow.cleanup.serviceAccount.name }}
 {{- end -}}

diff --git a/tests/chart/test_dag_deploy_rolebinding.py b/tests/chart/test_dag_deploy_rolebinding.py
@@ -48,3 +48,25 @@ def test_dag_deploy_rolebinding_dag_server_enabled(self, kube_version):
         assert downloader["roleRef"]["kind"] == "Role"
         assert downloader["roleRef"]["name"] == "release-name-dag-downloader-role"
         assert downloader["roleRef"]["apiGroup"] == "rbac.authorization.k8s.io"
+        assert [
+            {
+                "kind": "ServiceAccount",
+                "name": "release-name-airflow-webserver",
+                "namespace": "test-namespace",
+            },
+            {
+                "kind": "ServiceAccount",
+                "name": "release-name-airflow-triggerer",
+                "namespace": "test-namespace",
+            },
+            {
+                "kind": "ServiceAccount",
+                "name": "release-name-airflow-worker",
+                "namespace": "test-namespace",
+            },
+            {
+                "kind": "ServiceAccount",
+                "name": "release-name-airflow-scheduler",
+                "namespace": "test-namespace",
+            },
+        ] == downloader["subjects"]