Reformat chart templates part 3

chart/files/pod-template-file.kubernetes-helm-yaml

@@ -86,7 +86,7 @@ spec:
  hostAliases: {{- toYaml .Values.workers.hostAliases | nindent 4 }}
  {{- end }}
  restartPolicy: Never
- securityContext: {{- $securityContext | nindent 4 }}
+ securityContext: {{ $securityContext | nindent 4 }}
  nodeSelector: {{- toYaml $nodeSelector | nindent 4 }}
  affinity: {{- toYaml $affinity | nindent 4 }}
  tolerations: {{- toYaml $tolerations | nindent 4 }}

chart/templates/dag-processor/dag-processor-deployment.yaml

@@ -114,11 +114,11 @@ spec:
  image: {{ template "airflow_image_for_migrations" . }}
  imagePullPolicy: {{ .Values.images.airflow.pullPolicy }}
  volumeMounts: {{- include "airflow_config_mount" . | nindent 12 }}
- args: {{- include "wait-for-migrations-command" . | nindent 10 }}
- envFrom: {{- include "custom_airflow_environment_from" . | default "\n []" | nindent 10 }}
+ args: {{- include "wait-for-migrations-command" . | indent 10 }}
+ envFrom: {{- include "custom_airflow_environment_from" . | default "\n []" | indent 10 }}
  env:
- {{- include "custom_airflow_environment" . | nindent 10 }}
- {{- include "standard_airflow_environment" . | nindent 10 }}
+ {{- include "custom_airflow_environment" . | indent 10 }}
+ {{- include "standard_airflow_environment" . | indent 10 }}
  {{- if .Values.dagProcessor.waitForMigrations.env }}
  {{- tpl (toYaml .Values.dagProcessor.waitForMigrations.env) $ | nindent 12 }}
  {{- end }}
@@ -153,10 +153,10 @@ spec:
  {{- if or .Values.dags.persistence.enabled .Values.dags.gitSync.enabled }}
  {{- include "airflow_dags_mount" . | nindent 12 }}
  {{- end }}
- envFrom: {{- include "custom_airflow_environment_from" . | default "\n []" | nindent 10 }}
+ envFrom: {{- include "custom_airflow_environment_from" . | default "\n []" | indent 10 }}
  env:
- {{- include "custom_airflow_environment" . | nindent 10 }}
- {{- include "standard_airflow_environment" . | nindent 10 }}
+ {{- include "custom_airflow_environment" . | indent 10 }}
+ {{- include "standard_airflow_environment" . | indent 10 }}
  {{- include "container_extra_envs" (list . .Values.dagProcessor.env) | indent 10 }}
  livenessProbe:
  initialDelaySeconds: {{ .Values.dagProcessor.livenessProbe.initialDelaySeconds }}
@@ -165,11 +165,11 @@ spec:
  periodSeconds: {{ .Values.dagProcessor.livenessProbe.periodSeconds }}
  exec:
  command:
-  {{- if .Values.dagProcessor.livenessProbe.command }}
- {{ toYaml .Values.dagProcessor.livenessProbe.command | nindent 16 }}
-  {{- else }}
- {{- include "dag_processor_liveness_check_command" . | nindent 16 }}
-  {{- end }}
+ {{- if .Values.dagProcessor.livenessProbe.command }}
+ {{- toYaml .Values.dagProcessor.livenessProbe.command | nindent 16 }}
+ {{- else }}
+ {{- include "dag_processor_liveness_check_command" . | indent 14 }}
+ {{- end }}
  {{- if and (.Values.dags.gitSync.enabled) (not .Values.dags.persistence.enabled) }}
  {{- include "git_sync_container" . | indent 8 }}
  {{- end }}

chart/templates/jobs/create-user-job.yaml

@@ -93,7 +93,7 @@ spec:
  {{- if .Values.createUserJob.applyCustomEnv }}
  envFrom: {{- include "custom_airflow_environment_from" . | default "\n []" | indent 10 }}
  env: {{- include "custom_airflow_environment" . | indent 10 }}
- {{ else }}
+ {{- else }}
  env:
  {{- end }}
  {{- include "standard_airflow_environment" . | indent 10 }}
@@ -105,7 +105,7 @@ spec:
  {{- toYaml .Values.volumeMounts | nindent 12 }}
  {{- end }}
  {{- if .Values.createUserJob.extraVolumeMounts }}
- {{ toYaml .Values.createUserJob.extraVolumeMounts | nindent 12 }}
+ {{- toYaml .Values.createUserJob.extraVolumeMounts | nindent 12 }}
  {{- end }}
  {{- if .Values.createUserJob.extraContainers }}
  {{- toYaml .Values.createUserJob.extraContainers | nindent 8 }}

chart/templates/jobs/migrate-database-job.yaml

@@ -85,15 +85,15 @@ spec:
  image: {{ template "airflow_image_for_migrations" . }}
  imagePullPolicy: {{ .Values.images.airflow.pullPolicy }}
  {{- if .Values.migrateDatabaseJob.command }}
- command: {{ tpl (toYaml .Values.migrateDatabaseJob.command) . | nindent 12 }}
+ command: {{- tpl (toYaml .Values.migrateDatabaseJob.command) . | nindent 12 }}
  {{- end }}
  {{- if .Values.migrateDatabaseJob.args }}
- args: {{ tpl (toYaml .Values.migrateDatabaseJob.args) . | nindent 12 }}
+ args: {{- tpl (toYaml .Values.migrateDatabaseJob.args) . | nindent 12 }}
  {{- end }}
  {{- if .Values.migrateDatabaseJob.applyCustomEnv }}
  envFrom: {{- include "custom_airflow_environment_from" . | default "\n []" | indent 10 }}
  env: {{- include "custom_airflow_environment" . | indent 10 }}
- {{ else }}
+ {{- else }}
  env:
  {{- end }}
  - name: PYTHONUNBUFFERED
@@ -106,7 +106,7 @@ spec:
  {{- toYaml .Values.volumeMounts | nindent 12 }}
  {{- end }}
  {{- if .Values.migrateDatabaseJob.extraVolumeMounts }}
- {{ tpl (toYaml .Values.migrateDatabaseJob.extraVolumeMounts) . | nindent 12 }}
+ {{- tpl (toYaml .Values.migrateDatabaseJob.extraVolumeMounts) . | nindent 12 }}
  {{- end }}
  {{- if .Values.migrateDatabaseJob.extraContainers }}
  {{- toYaml .Values.migrateDatabaseJob.extraContainers | nindent 8 }}

chart/templates/pgbouncer/pgbouncer-networkpolicy.yaml

@@ -56,10 +56,10 @@ spec:
  {{- end }}
  matchLabels:
  app: keda-operator
- {{- end}}
+ {{- end }}
  {{- if .Values.pgbouncer.extraNetworkPolicies}}
  {{- toYaml .Values.pgbouncer.extraNetworkPolicies | nindent 4 }}
- {{- end}}
+ {{- end }}
  ports:
  - protocol: TCP
  port: {{ .Values.ports.pgbouncer }}

chart/templates/pgbouncer/pgbouncer-poddisruptionbudget.yaml

@@ -42,5 +42,5 @@ spec:
  tier: airflow
  component: pgbouncer
  release: {{ .Release.Name }}
-{{ toYaml .Values.pgbouncer.podDisruptionBudget.config | indent 2 }}
+ {{- toYaml .Values.pgbouncer.podDisruptionBudget.config | nindent 2 }}
 {{- end }}

chart/templates/rbac/security-context-constraint-rolebinding.yaml

@@ -64,7 +64,7 @@ subjects:
  - kind: ServiceAccount
  name: {{ include "flower.serviceAccountName" . }}
  namespace: "{{ .Release.Namespace }}"
- {{- end}}
+ {{- end }}
  {{- if and (semverCompare ">=2.2.0" .Values.airflowVersion) }}
  - kind: ServiceAccount
  name: {{ include "triggerer.serviceAccountName" . }}

chart/templates/scheduler/scheduler-deployment.yaml

@@ -125,10 +125,9 @@ spec:
  imagePullSecrets:
  - name: {{ template "registry_secret" . }}
  {{- end }}
-{{- if .Values.scheduler.hostAliases }}
- hostAliases:
-{{ toYaml .Values.scheduler.hostAliases | indent 8 }}
-{{- end }}
+ {{- if .Values.scheduler.hostAliases }}
+ hostAliases: {{- toYaml .Values.scheduler.hostAliases | nindent 8 }}
+ {{- end }}
  initContainers:
  {{- if .Values.scheduler.waitForMigrations.enabled }}
  - name: wait-for-airflow-migrations
@@ -184,11 +183,11 @@ spec:
  periodSeconds: {{ .Values.scheduler.livenessProbe.periodSeconds }}
  exec:
  command:
-  {{- if .Values.scheduler.livenessProbe.command }}
-  {{- toYaml .Values.scheduler.livenessProbe.command | nindent 16 }}
-  {{- else}}
-  {{- include "scheduler_liveness_check_command" . | nindent 16 }}
-  {{- end }}
+ {{- if .Values.scheduler.livenessProbe.command }}
+ {{- toYaml .Values.scheduler.livenessProbe.command | nindent 16 }}
+ {{- else }}
+ {{- include "scheduler_liveness_check_command" . | indent 14 }}
+ {{- end }}
  {{- if and $local (not $elasticsearch) }}
  # Serve logs if we're in local mode and we don't have elasticsearch enabled.
  ports:
@@ -219,7 +218,7 @@ spec:
  {{- toYaml .Values.scheduler.extraVolumeMounts | nindent 12 }}
  {{- end }}
  {{- if and $localOrDagProcessorDisabled .Values.dags.gitSync.enabled }}
- {{- include "git_sync_container" . | indent 8 }}
+  {{- include "git_sync_container" . | indent 8 }}
  {{- end }}
  {{- if .Values.scheduler.logGroomerSidecar.enabled }}
  - name: scheduler-log-groomer
@@ -232,7 +231,7 @@ spec:
  {{- if .Values.scheduler.logGroomerSidecar.args }}
  args: {{- tpl (toYaml .Values.scheduler.logGroomerSidecar.args) . | nindent 12 }}
  {{- end }}
- {{ if .Values.scheduler.logGroomerSidecar.retentionDays }}
+ {{- if .Values.scheduler.logGroomerSidecar.retentionDays }}
  env:
  - name: AIRFLOW__LOG_RETENTION_DAYS
  value: "{{ .Values.scheduler.logGroomerSidecar.retentionDays }}"
@@ -271,7 +270,7 @@ spec:
  - name: dags
  emptyDir: {}
  {{- if .Values.dags.gitSync.sshKeySecret }}
- {{- include "git_sync_ssh_key_volume" . | indent 8 }}
+  {{- include "git_sync_ssh_key_volume" . | indent 8 }}
  {{- end }}
  {{- end }}
  {{- end }}

chart/templates/scheduler/scheduler-poddisruptionbudget.yaml

@@ -42,5 +42,5 @@ spec:
  tier: airflow
  component: scheduler
  release: {{ .Release.Name }}
-{{ toYaml .Values.scheduler.podDisruptionBudget.config | indent 2 }}
+ {{- toYaml .Values.scheduler.podDisruptionBudget.config | nindent 2 }}
 {{- end }}

chart/templates/scheduler/scheduler-serviceaccount.yaml

@@ -36,6 +36,6 @@ metadata:
  annotations:
  {{- range $key, $value := . }}
  {{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
-  {{- end }}
+ {{- end }}
  {{- end }}
 {{- end }}

chart/templates/secrets/fernetkey-secret.yaml

@@ -19,7 +19,7 @@
 ## Airflow Fernet Key Secret
 #################################
 {{- if not .Values.fernetKeySecretName }}
-{{ $generated_fernet_key := (randAlphaNum 32 | b64enc) }}
+{{- $generated_fernet_key := (randAlphaNum 32 | b64enc) }}
 kind: Secret
 apiVersion: v1
 metadata:

chart/templates/secrets/kerberos-keytab-secret.yaml

@@ -15,7 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-{{ if .Values.kerberos.keytabBase64Content }}
+################################
+## Kerberos Secret
+#################################
+{{- if .Values.kerberos.keytabBase64Content }}
 apiVersion: v1
 metadata:
  name: {{ include "kerberos_keytab_secret" . | quote }}
@@ -32,4 +35,4 @@ data:
  kerberos.keytab: {{ .Values.kerberos.keytabBase64Content }}
 kind: Secret
 type: Opaque
-{{ end }}
+{{- end }}

chart/templates/secrets/metadata-connection-secret.yaml

@@ -26,7 +26,6 @@
 {{- $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
 metadata:

chart/templates/triggerer/triggerer-deployment.yaml

@@ -136,8 +136,8 @@ spec:
  args: {{- include "wait-for-migrations-command" . | indent 10 }}
  envFrom: {{- include "custom_airflow_environment_from" . | default "\n []" | indent 10 }}
  env:
- {{- include "custom_airflow_environment" . | nindent 10 }}
- {{- include "standard_airflow_environment" . | nindent 10 }}
+ {{- include "custom_airflow_environment" . | indent 10 }}
+ {{- include "standard_airflow_environment" . | indent 10 }}
  {{- if .Values.triggerer.waitForMigrations.env }}
  {{- tpl (toYaml .Values.triggerer.waitForMigrations.env) $ | nindent 12 }}
  {{- end }}
@@ -177,8 +177,8 @@ spec:
  {{- end }}
  envFrom: {{- include "custom_airflow_environment_from" . | default "\n []" | indent 10 }}
  env:
- {{- include "custom_airflow_environment" . | nindent 10 }}
- {{- include "standard_airflow_environment" . | nindent 10 }}
+ {{- include "custom_airflow_environment" . | indent 10 }}
+ {{- include "standard_airflow_environment" . | indent 10 }}
  {{- include "container_extra_envs" (list . .Values.triggerer.env) | nindent 10 }}
  livenessProbe:
  initialDelaySeconds: {{ .Values.triggerer.livenessProbe.initialDelaySeconds }}
@@ -187,11 +187,11 @@ spec:
  periodSeconds: {{ .Values.triggerer.livenessProbe.periodSeconds }}
  exec:
  command:
-  {{- if .Values.triggerer.livenessProbe.command }}
-  {{- toYaml .Values.triggerer.livenessProbe.command | nindent 16 }}
-  {{- else }}
-  {{- include "triggerer_liveness_check_command" . | nindent 16 }}
-  {{- end }}
+ {{- if .Values.triggerer.livenessProbe.command }}
+ {{- toYaml .Values.triggerer.livenessProbe.command | nindent 16 }}
+ {{- else }}
+ {{- include "triggerer_liveness_check_command" . | indent 14 }}
+ {{- end }}
  {{- /* Airflow version 2.6.0 is when triggerer logs serve introduced */ -}}
  {{- if semverCompare ">=2.6.0" .Values.airflowVersion }}
  ports:

chart/templates/webserver/webserver-deployment.yaml

@@ -63,8 +63,8 @@ spec:
  maxUnavailable: 0
  {{- else }}
  type: Recreate
- {{- end}}
- {{- end}}
+ {{- end }}
+ {{- end }}
  selector:
  matchLabels:
  tier: airflow
@@ -94,10 +94,9 @@ spec:
  {{- toYaml .Values.webserver.podAnnotations | nindent 8 }}
  {{- end }}
  spec:
-{{- if .Values.webserver.hostAliases }}
- hostAliases:
-{{ toYaml .Values.webserver.hostAliases | indent 8 }}
-{{- end }}
+ {{- if .Values.webserver.hostAliases }}
+ hostAliases: {{- toYaml .Values.webserver.hostAliases | nindent 8 }}
+ {{- end }}
  serviceAccountName: {{ include "webserver.serviceAccountName" . }}
  {{- if .Values.webserver.priorityClassName }}
  priorityClassName: {{ .Values.webserver.priorityClassName }}
@@ -196,7 +195,7 @@ spec:
  containerPort: {{ .Values.ports.airflowUI }}
  livenessProbe:
  httpGet:
- path: {{if .Values.config.webserver.base_url }}{{- with urlParse (tpl .Values.config.webserver.base_url .) }}{{ .path }}{{end}}{{end}}/health
+ path: {{ if .Values.config.webserver.base_url }}{{- with urlParse (tpl .Values.config.webserver.base_url .) }}{{ .path }}{{ end }}{{ end }}/health
  port: {{ .Values.ports.airflowUI }}
  {{- if .Values.config.webserver.base_url}}
  httpHeaders:

chart/templates/webserver/webserver-poddisruptionbudget.yaml

@@ -42,5 +42,5 @@ spec:
  tier: airflow
  component: webserver
  release: {{ .Release.Name }}
-{{ toYaml .Values.webserver.podDisruptionBudget.config | indent 2 }}
+ {{- toYaml .Values.webserver.podDisruptionBudget.config | nindent 2 }}
 {{- end }}

chart/templates/workers/worker-deployment.yaml

@@ -187,13 +187,13 @@ spec:
  periodSeconds: {{ .Values.workers.livenessProbe.periodSeconds }}
  exec:
  command:
-  {{- if .Values.workers.livenessProbe.command }}
- {{ toYaml .Values.workers.livenessProbe.command | nindent 16 }}
-  {{- else}}
-  - sh
-  - -c
-  - CONNECTION_CHECK_MAX_COUNT=0 exec /entrypoint python -m celery --app airflow.executors.celery_executor.app inspect ping -d celery@$(hostname)
-  {{- end }}
+ {{- if .Values.workers.livenessProbe.command }}
+ {{- toYaml .Values.workers.livenessProbe.command | nindent 16 }}
+ {{- else }}
+ - sh
+ - -c
+ - CONNECTION_CHECK_MAX_COUNT=0 exec /entrypoint python -m celery --app airflow.executors.celery_executor.app inspect ping -d celery@$(hostname)
+ {{- end }}
  {{- end }}
  ports:
  - name: worker-logs
@@ -254,7 +254,7 @@ spec:
  {{- if .Values.workers.logGroomerSidecar.args }}
  args: {{ tpl (toYaml .Values.workers.logGroomerSidecar.args) . | nindent 12 }}
  {{- end }}
- {{ if .Values.workers.logGroomerSidecar.retentionDays }}
+ {{- if .Values.workers.logGroomerSidecar.retentionDays }}
  env:
  - name: AIRFLOW__LOG_RETENTION_DAYS
  value: "{{ .Values.workers.logGroomerSidecar.retentionDays }}"
@@ -303,7 +303,7 @@ spec:
  {{- if or .Values.webserver.webserverConfig .Values.webserver.webserverConfigConfigMapName }}
  {{- include "airflow_webserver_config_mount" . | nindent 12 }}
  {{- end }}
- envFrom: {{- include "custom_airflow_environment_from" . | default "\n []" | nindent 10 }}
+ envFrom: {{- include "custom_airflow_environment_from" . | default "\n []" | indent 10 }}
  env:
  - name: KRB5_CONFIG
  value: {{ .Values.kerberos.configPath | quote }}