This is an automated email from the ASF dual-hosted git repository.
jedcunningham pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 7e7add0bf4 Align apiVersion and kind order in chart templates (#31850)
7e7add0bf4 is described below
commit 7e7add0bf4512760280f31cfd74bdf0ce1705692
Author: Denis Krivenko <[email protected]>
AuthorDate: Wed Jun 14 04:55:19 2023 +0200
Align apiVersion and kind order in chart templates (#31850)
---
chart/templates/cleanup/cleanup-serviceaccount.yaml | 2 +-
chart/templates/dag-processor/dag-processor-deployment.yaml | 2 +-
chart/templates/dag-processor/dag-processor-serviceaccount.yaml | 2 +-
chart/templates/dags-persistent-volume-claim.yaml | 2 +-
chart/templates/flower/flower-deployment.yaml | 2 +-
chart/templates/flower/flower-service.yaml | 2 +-
chart/templates/flower/flower-serviceaccount.yaml | 2 +-
chart/templates/jobs/create-user-job-serviceaccount.yaml | 2 +-
chart/templates/jobs/migrate-database-job-serviceaccount.yaml | 2 +-
chart/templates/logs-persistent-volume-claim.yaml | 2 +-
chart/templates/pgbouncer/pgbouncer-deployment.yaml | 2 +-
chart/templates/pgbouncer/pgbouncer-poddisruptionbudget.yaml | 2 +-
chart/templates/pgbouncer/pgbouncer-serviceaccount.yaml | 2 +-
chart/templates/rbac/pod-cleanup-role.yaml | 2 +-
chart/templates/rbac/pod-cleanup-rolebinding.yaml | 2 +-
chart/templates/rbac/pod-launcher-role.yaml | 2 +-
chart/templates/rbac/pod-launcher-rolebinding.yaml | 2 +-
chart/templates/rbac/pod-log-reader-role.yaml | 2 +-
chart/templates/rbac/pod-log-reader-rolebinding.yaml | 2 +-
chart/templates/rbac/security-context-constraint-rolebinding.yaml | 2 +-
chart/templates/redis/redis-service.yaml | 2 +-
chart/templates/redis/redis-serviceaccount.yaml | 2 +-
chart/templates/redis/redis-statefulset.yaml | 2 +-
chart/templates/scheduler/scheduler-deployment.yaml | 2 +-
chart/templates/scheduler/scheduler-poddisruptionbudget.yaml | 2 +-
chart/templates/scheduler/scheduler-service.yaml | 2 +-
chart/templates/scheduler/scheduler-serviceaccount.yaml | 2 +-
chart/templates/secrets/elasticsearch-secret.yaml | 2 +-
chart/templates/secrets/fernetkey-secret.yaml | 2 +-
chart/templates/secrets/flower-secret.yaml | 2 +-
chart/templates/secrets/kerberos-keytab-secret.yaml | 4 ++--
chart/templates/secrets/metadata-connection-secret.yaml | 2 +-
chart/templates/secrets/pgbouncer-certificates-secret.yaml | 2 +-
chart/templates/secrets/pgbouncer-config-secret.yaml | 2 +-
chart/templates/secrets/pgbouncer-stats-secret.yaml | 2 +-
chart/templates/secrets/redis-secrets.yaml | 4 ++--
chart/templates/secrets/registry-secret.yaml | 2 +-
chart/templates/secrets/result-backend-connection-secret.yaml | 2 +-
chart/templates/secrets/webserver-secret-key-secret.yaml | 2 +-
chart/templates/statsd/statsd-deployment.yaml | 2 +-
chart/templates/statsd/statsd-service.yaml | 2 +-
chart/templates/statsd/statsd-serviceaccount.yaml | 2 +-
chart/templates/triggerer/triggerer-deployment.yaml | 2 +-
chart/templates/triggerer/triggerer-service.yaml | 2 +-
chart/templates/triggerer/triggerer-serviceaccount.yaml | 2 +-
chart/templates/webserver/webserver-deployment.yaml | 2 +-
chart/templates/webserver/webserver-poddisruptionbudget.yaml | 2 +-
chart/templates/webserver/webserver-service.yaml | 2 +-
chart/templates/webserver/webserver-serviceaccount.yaml | 2 +-
chart/templates/workers/worker-deployment.yaml | 2 +-
chart/templates/workers/worker-service.yaml | 2 +-
chart/templates/workers/worker-serviceaccount.yaml | 2 +-
52 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/chart/templates/cleanup/cleanup-serviceaccount.yaml
b/chart/templates/cleanup/cleanup-serviceaccount.yaml
index e1e8deaae6..f243404e90 100644
--- a/chart/templates/cleanup/cleanup-serviceaccount.yaml
+++ b/chart/templates/cleanup/cleanup-serviceaccount.yaml
@@ -21,8 +21,8 @@
## Airflow Cleanup ServiceAccount
#################################
{{- if and .Values.cleanup.serviceAccount.create .Values.cleanup.enabled }}
-kind: ServiceAccount
apiVersion: v1
+kind: ServiceAccount
metadata:
name: {{ include "cleanup.serviceAccountName" . }}
labels:
diff --git a/chart/templates/dag-processor/dag-processor-deployment.yaml
b/chart/templates/dag-processor/dag-processor-deployment.yaml
index 33782a6e85..d2498b495d 100644
--- a/chart/templates/dag-processor/dag-processor-deployment.yaml
+++ b/chart/templates/dag-processor/dag-processor-deployment.yaml
@@ -29,8 +29,8 @@
{{- $revisionHistoryLimit := or .Values.dagProcessor.revisionHistoryLimit
.Values.revisionHistoryLimit }}
{{- $securityContext := include "airflowPodSecurityContext" (list .
.Values.dagProcessor) }}
{{- $containerSecurityContext := include "containerSecurityContext" (list .
.Values.dagProcessor) }}
-kind: Deployment
apiVersion: apps/v1
+kind: Deployment
metadata:
name: {{ .Release.Name }}-dag-processor
labels:
diff --git a/chart/templates/dag-processor/dag-processor-serviceaccount.yaml
b/chart/templates/dag-processor/dag-processor-serviceaccount.yaml
index 750066a658..6be9bb6d1e 100644
--- a/chart/templates/dag-processor/dag-processor-serviceaccount.yaml
+++ b/chart/templates/dag-processor/dag-processor-serviceaccount.yaml
@@ -22,8 +22,8 @@
#################################
{{- if semverCompare ">=2.3.0" .Values.airflowVersion }}
{{- if and .Values.dagProcessor.serviceAccount.create
.Values.dagProcessor.enabled }}
-kind: ServiceAccount
apiVersion: v1
+kind: ServiceAccount
metadata:
name: {{ include "dagProcessor.serviceAccountName" . }}
labels:
diff --git a/chart/templates/dags-persistent-volume-claim.yaml
b/chart/templates/dags-persistent-volume-claim.yaml
index b93a8e9fd6..15628cac46 100644
--- a/chart/templates/dags-persistent-volume-claim.yaml
+++ b/chart/templates/dags-persistent-volume-claim.yaml
@@ -21,8 +21,8 @@
## Airflow DAGs PersistentVolumeClaim
######################################
{{- if and (not .Values.dags.persistence.existingClaim )
.Values.dags.persistence.enabled }}
-kind: PersistentVolumeClaim
apiVersion: v1
+kind: PersistentVolumeClaim
metadata:
name: {{ template "airflow_dags_volume_claim" . }}
labels:
diff --git a/chart/templates/flower/flower-deployment.yaml
b/chart/templates/flower/flower-deployment.yaml
index 418a5f51c3..96bb8dd267 100644
--- a/chart/templates/flower/flower-deployment.yaml
+++ b/chart/templates/flower/flower-deployment.yaml
@@ -29,8 +29,8 @@
{{- $revisionHistoryLimit := or .Values.flower.revisionHistoryLimit
.Values.revisionHistoryLimit }}
{{- $securityContext := include "airflowPodSecurityContext" (list .
.Values.flower) }}
{{- $containerSecurityContext := include "containerSecurityContext" (list .
.Values.flower) }}
-kind: Deployment
apiVersion: apps/v1
+kind: Deployment
metadata:
name: {{ .Release.Name }}-flower
labels:
diff --git a/chart/templates/flower/flower-service.yaml
b/chart/templates/flower/flower-service.yaml
index ddc86ed90c..695779b896 100644
--- a/chart/templates/flower/flower-service.yaml
+++ b/chart/templates/flower/flower-service.yaml
@@ -22,8 +22,8 @@
#################################
{{- if .Values.flower.enabled }}
{{- if or (eq .Values.executor "CeleryExecutor") (eq .Values.executor
"CeleryKubernetesExecutor") }}
-kind: Service
apiVersion: v1
+kind: Service
metadata:
name: {{ .Release.Name }}-flower
labels:
diff --git a/chart/templates/flower/flower-serviceaccount.yaml
b/chart/templates/flower/flower-serviceaccount.yaml
index 1b597be678..cc8e925808 100644
--- a/chart/templates/flower/flower-serviceaccount.yaml
+++ b/chart/templates/flower/flower-serviceaccount.yaml
@@ -21,8 +21,8 @@
## Airflow Flower ServiceAccount
######################################
{{- if and .Values.flower.enabled (or (eq .Values.executor "CeleryExecutor")
(eq .Values.executor "CeleryKubernetesExecutor"))
.Values.flower.serviceAccount.create }}
-kind: ServiceAccount
apiVersion: v1
+kind: ServiceAccount
metadata:
name: {{ include "flower.serviceAccountName" . }}
labels:
diff --git a/chart/templates/jobs/create-user-job-serviceaccount.yaml
b/chart/templates/jobs/create-user-job-serviceaccount.yaml
index b112862ef8..bbe1a381a5 100644
--- a/chart/templates/jobs/create-user-job-serviceaccount.yaml
+++ b/chart/templates/jobs/create-user-job-serviceaccount.yaml
@@ -21,8 +21,8 @@
## Airflow Create User Job ServiceAccount
###########################################
{{- if and .Values.createUserJob.serviceAccount.create
.Values.webserver.defaultUser.enabled }}
-kind: ServiceAccount
apiVersion: v1
+kind: ServiceAccount
metadata:
name: {{ include "createUserJob.serviceAccountName" . }}
labels:
diff --git a/chart/templates/jobs/migrate-database-job-serviceaccount.yaml
b/chart/templates/jobs/migrate-database-job-serviceaccount.yaml
index f2644db8d4..45afe4f468 100644
--- a/chart/templates/jobs/migrate-database-job-serviceaccount.yaml
+++ b/chart/templates/jobs/migrate-database-job-serviceaccount.yaml
@@ -21,8 +21,8 @@
## Airflow Migrate Database Job ServiceAccount
##############################################
{{- if .Values.migrateDatabaseJob.serviceAccount.create }}
-kind: ServiceAccount
apiVersion: v1
+kind: ServiceAccount
metadata:
name: {{ include "migrateDatabaseJob.serviceAccountName" . }}
labels:
diff --git a/chart/templates/logs-persistent-volume-claim.yaml
b/chart/templates/logs-persistent-volume-claim.yaml
index c30ecf59d7..a45088858b 100644
--- a/chart/templates/logs-persistent-volume-claim.yaml
+++ b/chart/templates/logs-persistent-volume-claim.yaml
@@ -21,8 +21,8 @@
## Airflow LOGs PersistentVolumeClaim
######################################
{{- if and (not .Values.logs.persistence.existingClaim )
.Values.logs.persistence.enabled }}
-kind: PersistentVolumeClaim
apiVersion: v1
+kind: PersistentVolumeClaim
metadata:
name: {{ template "airflow_logs_volume_claim" . }}
labels:
diff --git a/chart/templates/pgbouncer/pgbouncer-deployment.yaml
b/chart/templates/pgbouncer/pgbouncer-deployment.yaml
index 9983397205..71e42cce37 100644
--- a/chart/templates/pgbouncer/pgbouncer-deployment.yaml
+++ b/chart/templates/pgbouncer/pgbouncer-deployment.yaml
@@ -28,8 +28,8 @@
{{- $revisionHistoryLimit := or .Values.pgbouncer.revisionHistoryLimit
.Values.revisionHistoryLimit }}
{{- $containerSecurityContext := include "containerSecurityContext" (list .
.Values.pgbouncer) }}
{{- $containerSecurityContextMetricsExporter := include
"containerSecurityContext" (list . .Values.pgbouncer.metricsExporterSidecar) }}
-kind: Deployment
apiVersion: apps/v1
+kind: Deployment
metadata:
name: {{ .Release.Name }}-pgbouncer
labels:
diff --git a/chart/templates/pgbouncer/pgbouncer-poddisruptionbudget.yaml
b/chart/templates/pgbouncer/pgbouncer-poddisruptionbudget.yaml
index 16f9cf38a5..73a9c7c6f9 100644
--- a/chart/templates/pgbouncer/pgbouncer-poddisruptionbudget.yaml
+++ b/chart/templates/pgbouncer/pgbouncer-poddisruptionbudget.yaml
@@ -21,8 +21,8 @@
## Pgbouncer PodDisruptionBudget
#################################
{{- if and .Values.pgbouncer.enabled
.Values.pgbouncer.podDisruptionBudget.enabled }}
-kind: PodDisruptionBudget
apiVersion: policy/v1
+kind: PodDisruptionBudget
metadata:
name: {{ .Release.Name }}-pgbouncer-pdb
labels:
diff --git a/chart/templates/pgbouncer/pgbouncer-serviceaccount.yaml
b/chart/templates/pgbouncer/pgbouncer-serviceaccount.yaml
index 9e3fdeb7e8..01e5fcca38 100644
--- a/chart/templates/pgbouncer/pgbouncer-serviceaccount.yaml
+++ b/chart/templates/pgbouncer/pgbouncer-serviceaccount.yaml
@@ -21,8 +21,8 @@
## Airflow Pgbouncer ServiceAccount
######################################
{{- if and .Values.pgbouncer.serviceAccount.create .Values.pgbouncer.enabled }}
-kind: ServiceAccount
apiVersion: v1
+kind: ServiceAccount
metadata:
name: {{ include "pgbouncer.serviceAccountName" . }}
labels:
diff --git a/chart/templates/rbac/pod-cleanup-role.yaml
b/chart/templates/rbac/pod-cleanup-role.yaml
index 8e78241113..2fc3986383 100644
--- a/chart/templates/rbac/pod-cleanup-role.yaml
+++ b/chart/templates/rbac/pod-cleanup-role.yaml
@@ -21,8 +21,8 @@
## Airflow Cleanup Role
#################################
{{- if and .Values.rbac.create .Values.cleanup.enabled }}
-kind: Role
apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
metadata:
name: {{ .Release.Name }}-cleanup-role
labels:
diff --git a/chart/templates/rbac/pod-cleanup-rolebinding.yaml
b/chart/templates/rbac/pod-cleanup-rolebinding.yaml
index 7cf3092850..9a85750ad4 100644
--- a/chart/templates/rbac/pod-cleanup-rolebinding.yaml
+++ b/chart/templates/rbac/pod-cleanup-rolebinding.yaml
@@ -21,8 +21,8 @@
## Airflow Cleanup Role Binding
#################################
{{- if and .Values.rbac.create .Values.cleanup.enabled }}
-kind: RoleBinding
apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
metadata:
name: {{ .Release.Name }}-cleanup-rolebinding
labels:
diff --git a/chart/templates/rbac/pod-launcher-role.yaml
b/chart/templates/rbac/pod-launcher-role.yaml
index 90d5125974..42b6013aff 100644
--- a/chart/templates/rbac/pod-launcher-role.yaml
+++ b/chart/templates/rbac/pod-launcher-role.yaml
@@ -21,12 +21,12 @@
## Airflow Pod Launcher Role
#################################
{{- if and .Values.rbac.create .Values.allowPodLaunching }}
+apiVersion: rbac.authorization.k8s.io/v1
{{- if .Values.multiNamespaceMode }}
kind: ClusterRole
{{- else }}
kind: Role
{{- end }}
-apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ .Release.Name }}-pod-launcher-role
{{- if not .Values.multiNamespaceMode }}
diff --git a/chart/templates/rbac/pod-launcher-rolebinding.yaml
b/chart/templates/rbac/pod-launcher-rolebinding.yaml
index 50820c8e2a..fc269f78a5 100644
--- a/chart/templates/rbac/pod-launcher-rolebinding.yaml
+++ b/chart/templates/rbac/pod-launcher-rolebinding.yaml
@@ -23,12 +23,12 @@
{{- if and .Values.rbac.create .Values.allowPodLaunching }}
{{- $schedulerLaunchExecutors := list "LocalExecutor"
"LocalKubernetesExecutor" "KubernetesExecutor" "CeleryKubernetesExecutor" }}
{{- $workerLaunchExecutors := list "CeleryExecutor" "LocalKubernetesExecutor"
"KubernetesExecutor" "CeleryKubernetesExecutor" }}
+apiVersion: rbac.authorization.k8s.io/v1
{{- if .Values.multiNamespaceMode }}
kind: ClusterRoleBinding
{{- else }}
kind: RoleBinding
{{- end }}
-apiVersion: rbac.authorization.k8s.io/v1
metadata:
{{- if not .Values.multiNamespaceMode }}
namespace: "{{ .Release.Namespace }}"
diff --git a/chart/templates/rbac/pod-log-reader-role.yaml
b/chart/templates/rbac/pod-log-reader-role.yaml
index 407b5cab3d..93fabc71a4 100644
--- a/chart/templates/rbac/pod-log-reader-role.yaml
+++ b/chart/templates/rbac/pod-log-reader-role.yaml
@@ -21,12 +21,12 @@
## Airflow Pod Reader Role
#################################
{{- if and .Values.rbac.create (or .Values.webserver.allowPodLogReading
.Values.triggerer.enabled) }}
+apiVersion: rbac.authorization.k8s.io/v1
{{- if .Values.multiNamespaceMode }}
kind: ClusterRole
{{- else }}
kind: Role
{{- end }}
-apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ .Release.Name }}-pod-log-reader-role
{{- if not .Values.multiNamespaceMode }}
diff --git a/chart/templates/rbac/pod-log-reader-rolebinding.yaml
b/chart/templates/rbac/pod-log-reader-rolebinding.yaml
index 5c85b490d2..7811017421 100644
--- a/chart/templates/rbac/pod-log-reader-rolebinding.yaml
+++ b/chart/templates/rbac/pod-log-reader-rolebinding.yaml
@@ -21,12 +21,12 @@
## Airflow Pod Reader Role Binding
#################################
{{- if and .Values.rbac.create (or .Values.webserver.allowPodLogReading
.Values.triggerer.enabled) }}
+apiVersion: rbac.authorization.k8s.io/v1
{{- if .Values.multiNamespaceMode }}
kind: ClusterRoleBinding
{{- else }}
kind: RoleBinding
{{- end }}
-apiVersion: rbac.authorization.k8s.io/v1
metadata:
{{- if not .Values.multiNamespaceMode }}
namespace: "{{ .Release.Namespace }}"
diff --git a/chart/templates/rbac/security-context-constraint-rolebinding.yaml
b/chart/templates/rbac/security-context-constraint-rolebinding.yaml
index 2ed0c37f05..9c6eff3c07 100644
--- a/chart/templates/rbac/security-context-constraint-rolebinding.yaml
+++ b/chart/templates/rbac/security-context-constraint-rolebinding.yaml
@@ -22,12 +22,12 @@
#################################
{{- if and .Values.rbac.create .Values.rbac.createSCCRoleBinding }}
{{- $hasWorkers := has .Values.executor (list "CeleryExecutor"
"LocalKubernetesExecutor" "KubernetesExecutor" "CeleryKubernetesExecutor") }}
+apiVersion: rbac.authorization.k8s.io/v1
{{- if .Values.multiNamespaceMode }}
kind: ClusterRoleBinding
{{- else }}
kind: RoleBinding
{{- end }}
-apiVersion: rbac.authorization.k8s.io/v1
metadata:
{{- if not .Values.multiNamespaceMode }}
namespace: "{{ .Release.Namespace }}"
diff --git a/chart/templates/redis/redis-service.yaml
b/chart/templates/redis/redis-service.yaml
index 38406b53f3..af857a5186 100644
--- a/chart/templates/redis/redis-service.yaml
+++ b/chart/templates/redis/redis-service.yaml
@@ -21,8 +21,8 @@
## Airflow Redis Service
#################################
{{- if and .Values.redis.enabled (or (eq .Values.executor "CeleryExecutor")
(eq .Values.executor "CeleryKubernetesExecutor")) }}
-kind: Service
apiVersion: v1
+kind: Service
metadata:
name: {{ .Release.Name }}-redis
labels:
diff --git a/chart/templates/redis/redis-serviceaccount.yaml
b/chart/templates/redis/redis-serviceaccount.yaml
index 3a8b382ee3..468f460df3 100644
--- a/chart/templates/redis/redis-serviceaccount.yaml
+++ b/chart/templates/redis/redis-serviceaccount.yaml
@@ -21,8 +21,8 @@
## Airflow Redis ServiceAccount
######################################
{{- if and .Values.redis.enabled .Values.redis.serviceAccount.create (or (eq
.Values.executor "CeleryExecutor") (eq .Values.executor
"CeleryKubernetesExecutor")) }}
-kind: ServiceAccount
apiVersion: v1
+kind: ServiceAccount
metadata:
name: {{ include "redis.serviceAccountName" . }}
labels:
diff --git a/chart/templates/redis/redis-statefulset.yaml
b/chart/templates/redis/redis-statefulset.yaml
index f83658d943..7b7866b8e3 100644
--- a/chart/templates/redis/redis-statefulset.yaml
+++ b/chart/templates/redis/redis-statefulset.yaml
@@ -27,8 +27,8 @@
{{- $topologySpreadConstraints := or .Values.redis.topologySpreadConstraints
.Values.topologySpreadConstraints }}
{{- $securityContext := include "localPodSecurityContext" .Values.redis }}
{{- $containerSecurityContext := include "containerSecurityContext" (list .
.Values.redis) }}
-kind: StatefulSet
apiVersion: apps/v1
+kind: StatefulSet
metadata:
name: {{ .Release.Name }}-redis
labels:
diff --git a/chart/templates/scheduler/scheduler-deployment.yaml
b/chart/templates/scheduler/scheduler-deployment.yaml
index de6f2dba54..ec466660e9 100644
--- a/chart/templates/scheduler/scheduler-deployment.yaml
+++ b/chart/templates/scheduler/scheduler-deployment.yaml
@@ -41,8 +41,8 @@
{{- $containerSecurityContext := include "containerSecurityContext" (list .
.Values.scheduler) }}
{{- $containerSecurityContextWaitForMigrations := include
"containerSecurityContext" (list . .Values.scheduler.waitForMigrations) }}
{{- $containerSecurityContextLogGroomerSidecar := include
"containerSecurityContext" (list . .Values.scheduler.logGroomerSidecar) }}
-kind: {{ if $stateful }}StatefulSet{{ else }}Deployment{{ end }}
apiVersion: apps/v1
+kind: {{ if $stateful }}StatefulSet{{ else }}Deployment{{ end }}
metadata:
name: {{ .Release.Name }}-scheduler
labels:
diff --git a/chart/templates/scheduler/scheduler-poddisruptionbudget.yaml
b/chart/templates/scheduler/scheduler-poddisruptionbudget.yaml
index 613b20bde3..b81ea19945 100644
--- a/chart/templates/scheduler/scheduler-poddisruptionbudget.yaml
+++ b/chart/templates/scheduler/scheduler-poddisruptionbudget.yaml
@@ -21,8 +21,8 @@
## Airflow Scheduler PodDisruptionBudget
#################################
{{- if .Values.scheduler.podDisruptionBudget.enabled }}
-kind: PodDisruptionBudget
apiVersion: policy/v1
+kind: PodDisruptionBudget
metadata:
name: {{ .Release.Name }}-scheduler-pdb
labels:
diff --git a/chart/templates/scheduler/scheduler-service.yaml
b/chart/templates/scheduler/scheduler-service.yaml
index b14c0df52e..761dc931b0 100644
--- a/chart/templates/scheduler/scheduler-service.yaml
+++ b/chart/templates/scheduler/scheduler-service.yaml
@@ -21,8 +21,8 @@
## Airflow Scheduler Service
#################################
{{- if or (eq .Values.executor "LocalExecutor") (eq .Values.executor
"LocalKubernetesExecutor") }}
-kind: Service
apiVersion: v1
+kind: Service
metadata:
name: {{ .Release.Name }}-scheduler
labels:
diff --git a/chart/templates/scheduler/scheduler-serviceaccount.yaml
b/chart/templates/scheduler/scheduler-serviceaccount.yaml
index 40115a0f2d..ac2d187235 100644
--- a/chart/templates/scheduler/scheduler-serviceaccount.yaml
+++ b/chart/templates/scheduler/scheduler-serviceaccount.yaml
@@ -21,8 +21,8 @@
## Airflow Scheduler ServiceAccount
#################################
{{- if .Values.scheduler.serviceAccount.create }}
-kind: ServiceAccount
apiVersion: v1
+kind: ServiceAccount
metadata:
name: {{ include "scheduler.serviceAccountName" . }}
labels:
diff --git a/chart/templates/secrets/elasticsearch-secret.yaml
b/chart/templates/secrets/elasticsearch-secret.yaml
index ada3d7b5eb..e8b1f79484 100644
--- a/chart/templates/secrets/elasticsearch-secret.yaml
+++ b/chart/templates/secrets/elasticsearch-secret.yaml
@@ -21,8 +21,8 @@
## Elasticsearch Secret
#################################
{{- if (and .Values.elasticsearch.enabled (not
.Values.elasticsearch.secretName)) }}
-kind: Secret
apiVersion: v1
+kind: Secret
metadata:
name: {{ .Release.Name }}-elasticsearch
labels:
diff --git a/chart/templates/secrets/fernetkey-secret.yaml
b/chart/templates/secrets/fernetkey-secret.yaml
index 8d57874614..a917aab2d3 100644
--- a/chart/templates/secrets/fernetkey-secret.yaml
+++ b/chart/templates/secrets/fernetkey-secret.yaml
@@ -22,8 +22,8 @@
#################################
{{- if not .Values.fernetKeySecretName }}
{{- $generated_fernet_key := (randAlphaNum 32 | b64enc) }}
-kind: Secret
apiVersion: v1
+kind: Secret
metadata:
name: {{ .Release.Name }}-fernet-key
labels:
diff --git a/chart/templates/secrets/flower-secret.yaml
b/chart/templates/secrets/flower-secret.yaml
index 5af5877c51..8bcfb7631b 100644
--- a/chart/templates/secrets/flower-secret.yaml
+++ b/chart/templates/secrets/flower-secret.yaml
@@ -21,8 +21,8 @@
## Flower Secret
#################################
{{- if (and (not .Values.flower.secretName) .Values.flower.username
.Values.flower.password) }}
-kind: Secret
apiVersion: v1
+kind: Secret
metadata:
name: {{ .Release.Name }}-flower
labels:
diff --git a/chart/templates/secrets/kerberos-keytab-secret.yaml
b/chart/templates/secrets/kerberos-keytab-secret.yaml
index 8e09bed154..7095e5015d 100644
--- a/chart/templates/secrets/kerberos-keytab-secret.yaml
+++ b/chart/templates/secrets/kerberos-keytab-secret.yaml
@@ -22,6 +22,7 @@
#################################
{{- if .Values.kerberos.keytabBase64Content }}
apiVersion: v1
+kind: Secret
metadata:
name: {{ include "kerberos_keytab_secret" . | quote }}
labels:
@@ -33,8 +34,7 @@ metadata:
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
+type: Opaque
data:
kerberos.keytab: {{ .Values.kerberos.keytabBase64Content }}
-kind: Secret
-type: Opaque
{{- end }}
diff --git a/chart/templates/secrets/metadata-connection-secret.yaml
b/chart/templates/secrets/metadata-connection-secret.yaml
index aab73196e6..6a3c839ca0 100644
--- a/chart/templates/secrets/metadata-connection-secret.yaml
+++ b/chart/templates/secrets/metadata-connection-secret.yaml
@@ -28,8 +28,8 @@
{{- $port := ((ternary .Values.ports.pgbouncer
.Values.data.metadataConnection.port .Values.pgbouncer.enabled) | toString) }}
{{- $database := (ternary (printf "%s-%s" .Release.Name "metadata")
.Values.data.metadataConnection.db .Values.pgbouncer.enabled) }}
{{- $query := ternary (printf "sslmode=%s"
.Values.data.metadataConnection.sslmode) "" (eq
.Values.data.metadataConnection.protocol "postgresql") }}
-kind: Secret
apiVersion: v1
+kind: Secret
metadata:
name: {{ .Release.Name }}-airflow-metadata
labels:
diff --git a/chart/templates/secrets/pgbouncer-certificates-secret.yaml
b/chart/templates/secrets/pgbouncer-certificates-secret.yaml
index 740663b114..45148391d3 100644
--- a/chart/templates/secrets/pgbouncer-certificates-secret.yaml
+++ b/chart/templates/secrets/pgbouncer-certificates-secret.yaml
@@ -21,8 +21,8 @@
## Pgbouncer Certificate Secret
#################################
{{- if or .Values.pgbouncer.ssl.ca .Values.pgbouncer.ssl.cert
.Values.pgbouncer.ssl.key }}
-kind: Secret
apiVersion: v1
+kind: Secret
metadata:
name: {{ template "pgbouncer_certificates_secret" . }}
labels:
diff --git a/chart/templates/secrets/pgbouncer-config-secret.yaml
b/chart/templates/secrets/pgbouncer-config-secret.yaml
index 6a68255947..7ffc97faa7 100644
--- a/chart/templates/secrets/pgbouncer-config-secret.yaml
+++ b/chart/templates/secrets/pgbouncer-config-secret.yaml
@@ -21,8 +21,8 @@
## Pgbouncer Config Secret
#################################
{{- if (and .Values.pgbouncer.enabled (not
.Values.pgbouncer.configSecretName)) }}
-kind: Secret
apiVersion: v1
+kind: Secret
metadata:
name: {{ template "pgbouncer_config_secret" . }}
labels:
diff --git a/chart/templates/secrets/pgbouncer-stats-secret.yaml
b/chart/templates/secrets/pgbouncer-stats-secret.yaml
index 038b1faf2f..378b632571 100644
--- a/chart/templates/secrets/pgbouncer-stats-secret.yaml
+++ b/chart/templates/secrets/pgbouncer-stats-secret.yaml
@@ -21,8 +21,8 @@
## Pgbouncer Stats Secret
#################################
{{- if .Values.pgbouncer.enabled }}
-kind: Secret
apiVersion: v1
+kind: Secret
metadata:
name: {{ template "pgbouncer_stats_secret" . }}
labels:
diff --git a/chart/templates/secrets/redis-secrets.yaml
b/chart/templates/secrets/redis-secrets.yaml
index 2525347d8a..ec1ed48e0a 100644
--- a/chart/templates/secrets/redis-secrets.yaml
+++ b/chart/templates/secrets/redis-secrets.yaml
@@ -30,8 +30,8 @@
{{- $random_redis_password := randAlphaNum 10 }}
{{- if and .Values.redis.enabled (not .Values.redis.passwordSecretName) }}
# If passwordSecretName is not set, we will either use the set password, or
use the generated one
-kind: Secret
apiVersion: v1
+kind: Secret
metadata:
name: {{ .Release.Name }}-redis-password
labels:
@@ -56,8 +56,8 @@ data:
##################################
## Airflow Redis Connection Secret
##################################
-kind: Secret
apiVersion: v1
+kind: Secret
metadata:
name: {{ .Release.Name }}-broker-url
labels:
diff --git a/chart/templates/secrets/registry-secret.yaml
b/chart/templates/secrets/registry-secret.yaml
index c392df33bf..a89ea5ec34 100644
--- a/chart/templates/secrets/registry-secret.yaml
+++ b/chart/templates/secrets/registry-secret.yaml
@@ -21,8 +21,8 @@
## Registry Secret
#################################
{{- if (and .Values.registry.connection (not .Values.registry.secretName)) }}
-kind: Secret
apiVersion: v1
+kind: Secret
metadata:
name: {{ .Release.Name }}-registry
labels:
diff --git a/chart/templates/secrets/result-backend-connection-secret.yaml
b/chart/templates/secrets/result-backend-connection-secret.yaml
index 4a9ab1b6e4..33ecb18a4e 100644
--- a/chart/templates/secrets/result-backend-connection-secret.yaml
+++ b/chart/templates/secrets/result-backend-connection-secret.yaml
@@ -30,8 +30,8 @@
{{- $port := (ternary .Values.ports.pgbouncer $connection.port
.Values.pgbouncer.enabled) | toString }}
{{- $database := ternary (printf "%s-%s" .Release.Name "result-backend")
$connection.db .Values.pgbouncer.enabled }}
{{- $query := ternary (printf "sslmode=%s" $connection.sslmode) "" (eq
$connection.protocol "postgresql") }}
-kind: Secret
apiVersion: v1
+kind: Secret
metadata:
name: {{ .Release.Name }}-airflow-result-backend
labels:
diff --git a/chart/templates/secrets/webserver-secret-key-secret.yaml
b/chart/templates/secrets/webserver-secret-key-secret.yaml
index 59814368c3..c7f89cadf6 100644
--- a/chart/templates/secrets/webserver-secret-key-secret.yaml
+++ b/chart/templates/secrets/webserver-secret-key-secret.yaml
@@ -22,8 +22,8 @@
############################################
{{- if not .Values.webserverSecretKeySecretName }}
{{ $generated_secret_key := (randAlphaNum 32 | b64enc) }}
-kind: Secret
apiVersion: v1
+kind: Secret
metadata:
name: {{ .Release.Name }}-webserver-secret-key
labels:
diff --git a/chart/templates/statsd/statsd-deployment.yaml
b/chart/templates/statsd/statsd-deployment.yaml
index 14b5abfbfd..28c89e4caa 100644
--- a/chart/templates/statsd/statsd-deployment.yaml
+++ b/chart/templates/statsd/statsd-deployment.yaml
@@ -28,8 +28,8 @@
{{- $revisionHistoryLimit := or .Values.statsd.revisionHistoryLimit
.Values.revisionHistoryLimit }}
{{- $securityContext := include "localPodSecurityContext" .Values.statsd }}
{{- $containerSecurityContext := include "containerSecurityContext" (list .
.Values.statsd) }}
-kind: Deployment
apiVersion: apps/v1
+kind: Deployment
metadata:
name: {{ .Release.Name }}-statsd
labels:
diff --git a/chart/templates/statsd/statsd-service.yaml
b/chart/templates/statsd/statsd-service.yaml
index 2b26332dfa..412acd09c5 100644
--- a/chart/templates/statsd/statsd-service.yaml
+++ b/chart/templates/statsd/statsd-service.yaml
@@ -21,8 +21,8 @@
## Airflow StatsD Service
#################################
{{- if .Values.statsd.enabled }}
-kind: Service
apiVersion: v1
+kind: Service
metadata:
name: {{ .Release.Name }}-statsd
labels:
diff --git a/chart/templates/statsd/statsd-serviceaccount.yaml
b/chart/templates/statsd/statsd-serviceaccount.yaml
index 698dde7999..ea052a1419 100644
--- a/chart/templates/statsd/statsd-serviceaccount.yaml
+++ b/chart/templates/statsd/statsd-serviceaccount.yaml
@@ -21,8 +21,8 @@
## Airflow StatsD ServiceAccount
######################################
{{- if and .Values.statsd.enabled .Values.statsd.serviceAccount.create }}
-kind: ServiceAccount
apiVersion: v1
+kind: ServiceAccount
metadata:
name: {{ include "statsd.serviceAccountName" . }}
labels:
diff --git a/chart/templates/triggerer/triggerer-deployment.yaml
b/chart/templates/triggerer/triggerer-deployment.yaml
index 3515794f74..d61dfb79f8 100644
--- a/chart/templates/triggerer/triggerer-deployment.yaml
+++ b/chart/templates/triggerer/triggerer-deployment.yaml
@@ -33,8 +33,8 @@
{{- $containerSecurityContext := include "containerSecurityContext" (list .
.Values.triggerer) }}
{{- $containerSecurityContextWaitForMigrations := include
"containerSecurityContext" (list . .Values.triggerer.waitForMigrations) }}
{{- $containerSecurityContextLogGroomer := include "containerSecurityContext"
(list . .Values.triggerer.logGroomerSidecar) }}
-kind: {{ if $persistence }}StatefulSet{{ else }}Deployment{{ end }}
apiVersion: apps/v1
+kind: {{ if $persistence }}StatefulSet{{ else }}Deployment{{ end }}
metadata:
name: {{ .Release.Name }}-triggerer
labels:
diff --git a/chart/templates/triggerer/triggerer-service.yaml
b/chart/templates/triggerer/triggerer-service.yaml
index f8513bfce7..eaf3a6f198 100644
--- a/chart/templates/triggerer/triggerer-service.yaml
+++ b/chart/templates/triggerer/triggerer-service.yaml
@@ -23,8 +23,8 @@
{{- /* Airflow version 2.6.0 is when triggerer logs serve introduced */ -}}
{{- if semverCompare ">=2.6.0" .Values.airflowVersion }}
{{- if .Values.triggerer.enabled }}
-kind: Service
apiVersion: v1
+kind: Service
metadata:
name: {{ .Release.Name }}-triggerer
labels:
diff --git a/chart/templates/triggerer/triggerer-serviceaccount.yaml
b/chart/templates/triggerer/triggerer-serviceaccount.yaml
index 1c4fce1d55..a1ff32fe30 100644
--- a/chart/templates/triggerer/triggerer-serviceaccount.yaml
+++ b/chart/templates/triggerer/triggerer-serviceaccount.yaml
@@ -22,8 +22,8 @@
#################################
{{- if semverCompare ">=2.2.0" .Values.airflowVersion }}
{{- if and .Values.triggerer.serviceAccount.create .Values.triggerer.enabled }}
-kind: ServiceAccount
apiVersion: v1
+kind: ServiceAccount
metadata:
name: {{ include "triggerer.serviceAccountName" . }}
labels:
diff --git a/chart/templates/webserver/webserver-deployment.yaml
b/chart/templates/webserver/webserver-deployment.yaml
index 06d7f2640d..0fb8447a16 100644
--- a/chart/templates/webserver/webserver-deployment.yaml
+++ b/chart/templates/webserver/webserver-deployment.yaml
@@ -28,8 +28,8 @@
{{- $securityContext := include "airflowPodSecurityContext" (list .
.Values.webserver) }}
{{- $containerSecurityContext := include "containerSecurityContext" (list .
.Values.webserver) }}
{{- $containerSecurityContextWaitForMigrations := include
"containerSecurityContext" (list . .Values.webserver.waitForMigrations) }}
-kind: Deployment
apiVersion: apps/v1
+kind: Deployment
metadata:
name: {{ .Release.Name }}-webserver
labels:
diff --git a/chart/templates/webserver/webserver-poddisruptionbudget.yaml
b/chart/templates/webserver/webserver-poddisruptionbudget.yaml
index 7b390c7590..e3cd7c3043 100644
--- a/chart/templates/webserver/webserver-poddisruptionbudget.yaml
+++ b/chart/templates/webserver/webserver-poddisruptionbudget.yaml
@@ -21,8 +21,8 @@
## Airflow Webserver PodDisruptionBudget
#################################
{{- if .Values.webserver.podDisruptionBudget.enabled }}
-kind: PodDisruptionBudget
apiVersion: policy/v1
+kind: PodDisruptionBudget
metadata:
name: {{ .Release.Name }}-webserver-pdb
labels:
diff --git a/chart/templates/webserver/webserver-service.yaml
b/chart/templates/webserver/webserver-service.yaml
index f217f22afb..a8ecdc3bb8 100644
--- a/chart/templates/webserver/webserver-service.yaml
+++ b/chart/templates/webserver/webserver-service.yaml
@@ -20,8 +20,8 @@
################################
## Airflow Webserver Service
#################################
-kind: Service
apiVersion: v1
+kind: Service
metadata:
name: {{ .Release.Name }}-webserver
labels:
diff --git a/chart/templates/webserver/webserver-serviceaccount.yaml
b/chart/templates/webserver/webserver-serviceaccount.yaml
index 879dac55f4..719ec78d16 100644
--- a/chart/templates/webserver/webserver-serviceaccount.yaml
+++ b/chart/templates/webserver/webserver-serviceaccount.yaml
@@ -21,8 +21,8 @@
## Airflow Webserver ServiceAccount
######################################
{{- if .Values.webserver.serviceAccount.create }}
-kind: ServiceAccount
apiVersion: v1
+kind: ServiceAccount
metadata:
name: {{ include "webserver.serviceAccountName" . }}
labels:
diff --git a/chart/templates/workers/worker-deployment.yaml
b/chart/templates/workers/worker-deployment.yaml
index d1e3c0e49a..1ce904c336 100644
--- a/chart/templates/workers/worker-deployment.yaml
+++ b/chart/templates/workers/worker-deployment.yaml
@@ -34,8 +34,8 @@
{{- $containerSecurityContextWaitForMigrations := include
"containerSecurityContext" (list . .Values.workers.waitForMigrations) }}
{{- $containerSecurityContextLogGroomerSidecar := include
"containerSecurityContext" (list . .Values.workers.logGroomerSidecar) }}
{{- $containerSecurityContextKerberosSidecar := include
"containerSecurityContext" (list . .Values.workers.kerberosSidecar) }}
-kind: {{ if $persistence }}StatefulSet{{ else }}Deployment{{ end }}
apiVersion: apps/v1
+kind: {{ if $persistence }}StatefulSet{{ else }}Deployment{{ end }}
metadata:
name: {{ .Release.Name }}-worker
labels:
diff --git a/chart/templates/workers/worker-service.yaml
b/chart/templates/workers/worker-service.yaml
index 7b45504bab..0344a6feb2 100644
--- a/chart/templates/workers/worker-service.yaml
+++ b/chart/templates/workers/worker-service.yaml
@@ -21,8 +21,8 @@
## Airflow Worker Service
#################################
{{- if or (eq .Values.executor "CeleryExecutor") (eq .Values.executor
"CeleryKubernetesExecutor") }}
-kind: Service
apiVersion: v1
+kind: Service
metadata:
name: {{ .Release.Name }}-worker
labels:
diff --git a/chart/templates/workers/worker-serviceaccount.yaml
b/chart/templates/workers/worker-serviceaccount.yaml
index b3f717c145..1000400510 100644
--- a/chart/templates/workers/worker-serviceaccount.yaml
+++ b/chart/templates/workers/worker-serviceaccount.yaml
@@ -21,8 +21,8 @@
## Airflow Worker ServiceAccount
#################################
{{- if and .Values.workers.serviceAccount.create (or (eq .Values.executor
"CeleryExecutor") (eq .Values.executor "CeleryKubernetesExecutor") (eq
.Values.executor "KubernetesExecutor") (eq .Values.executor
"LocalKubernetesExecutor")) }}
-kind: ServiceAccount
apiVersion: v1
+kind: ServiceAccount
metadata:
name: {{ include "worker.serviceAccountName" . }}
labels:
