From 82c5086985ffeb172236c5dfa9dc4ee89122dfeb Mon Sep 17 00:00:00 2001
From: Mathew Wicks <thesuperzapper@users.noreply.github.com>
Date: Mon, 26 Oct 2020 19:43:01 +1100
Subject: [PATCH] [stable/airflow] remove trailing newlines (#23951)

* [stable/airflow] update README.md

Signed-off-by: Mathew Wicks <thesuperzapper@users.noreply.github.com>

* [stable/airflow] remove trailing newlines

Signed-off-by: Mathew Wicks <thesuperzapper@users.noreply.github.com>
---
 stable/airflow/Chart.yaml                     |  2 +-
 stable/airflow/README.md                      |  2 +-
 .../templates/config/configmap-env.yaml       | 19 +++++++++----------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/stable/airflow/Chart.yaml b/stable/airflow/Chart.yaml
index 3fdae6170a..372231d6d0 100644
--- a/stable/airflow/Chart.yaml
+++ b/stable/airflow/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Airflow is a platform to programmatically author, schedule and monitor workflows
 name: airflow
-version: 7.13.0
+version: 7.13.1
 appVersion: 1.10.12
 icon: https://airflow.apache.org/_images/pin_large.png
 home: https://airflow.apache.org/
diff --git a/stable/airflow/README.md b/stable/airflow/README.md
index 355d3d1cd7..851a6c52eb 100644
--- a/stable/airflow/README.md
+++ b/stable/airflow/README.md
@@ -50,7 +50,7 @@ kubectl exec \
 
 ## Upgrade Steps
 
-Chart version numbers: [Chart.yaml](Chart.yaml) or [Helm Hub](https://hub.helm.sh/charts/stable/airflow)
+Chart version numbers: [Chart.yaml](Chart.yaml) or [Artifact Hub](https://artifacthub.io/packages/helm/helm-stable/airflow)
 
 - [v7.12.X → v7.13.0](UPGRADE.md#v712x--v7130)
 - [v7.11.X → v7.12.0](UPGRADE.md#v711x--v7120)
diff --git a/stable/airflow/templates/config/configmap-env.yaml b/stable/airflow/templates/config/configmap-env.yaml
index 3493748830..1ff3ef3da0 100644
--- a/stable/airflow/templates/config/configmap-env.yaml
+++ b/stable/airflow/templates/config/configmap-env.yaml
@@ -24,20 +24,19 @@ data:
   DATABASE_PORT: "{{ .Values.externalDatabase.port }}"
   DATABASE_USER: "{{ .Values.externalDatabase.user }}"
   DATABASE_DB: "{{ .Values.externalDatabase.database }}"
-  DATABASE_PROPERTIES: |
+  DATABASE_PROPERTIES: |-
     {{ .Values.externalDatabase.properties }}
   {{- end }}
   # bash command which echos the URL encoded value of $DATABASE_PASSWORD
-  DATABASE_PASSWORD_CMD: |
+  DATABASE_PASSWORD_CMD: |-
     echo ${DATABASE_PASSWORD} | python3 -c "import urllib.parse; encoded_pass = urllib.parse.quote(input()); print(encoded_pass)"
   # bash command which echos the DB connection string in SQLAlchemy format
-  DATABASE_SQLALCHEMY_CMD: |
+  DATABASE_SQLALCHEMY_CMD: |-
     {{ include "DATABASE_SQLALCHEMY_CMD" . }}
   # bash command which echos the DB connection string in Celery result_backend format
-  DATABASE_CELERY_CMD: |
+  DATABASE_CELERY_CMD: |-
     {{ include "DATABASE_CELERY_CMD" . }}
 
-
   {{- if eq .Values.airflow.executor "CeleryExecutor" }}
   ## ----------------
   ## Redis
@@ -53,10 +52,10 @@ data:
   {{- end }}
   # a bash command which echos the URL encoded value of $REDIS_PASSWORD
   # NOTE: if $REDIS_PASSWORD is non-empty, prints `:${REDIS_PASSWORD}@`, else ``
-  REDIS_PASSWORD_CMD: |
+  REDIS_PASSWORD_CMD: |-
     echo ${REDIS_PASSWORD} | python3 -c "import urllib.parse; encoded_pass = urllib.parse.quote(input()); print(f\":{encoded_pass}@\") if len(encoded_pass) > 0 else None"
   # a bash command which echos the Redis connection string
-  REDIS_CONNECTION_CMD: |
+  REDIS_CONNECTION_CMD: |-
     {{ include "REDIS_CONNECTION_CMD" . }}
   {{- end }}
 
@@ -72,7 +71,7 @@ data:
   {{- if .Values.airflow.fernetKey }}
   AIRFLOW__CORE__FERNET_KEY: "{{ .Values.airflow.fernetKey }}"
   {{- end }}
-  AIRFLOW__CORE__SQL_ALCHEMY_CONN_CMD: |
+  AIRFLOW__CORE__SQL_ALCHEMY_CONN_CMD: |-
     bash -c 'eval "$DATABASE_SQLALCHEMY_CMD"'
   {{- if .Values.web.serializeDAGs }}
   AIRFLOW__CORE__STORE_SERIALIZED_DAGS: "{{ .Values.web.serializeDAGs }}"
@@ -85,13 +84,13 @@ data:
   ## ----------------
   ## Airflow - CeleryExecutor
   ## ----------------
-  AIRFLOW__CELERY__BROKER_URL_CMD: |
+  AIRFLOW__CELERY__BROKER_URL_CMD: |-
     bash -c 'eval "$REDIS_CONNECTION_CMD"'
   {{- if .Values.flower.enabled }}
   AIRFLOW__CELERY__FLOWER_PORT: "5555"
   AIRFLOW__CELERY__FLOWER_URL_PREFIX: "{{ .Values.flower.urlPrefix }}"
   {{- end }}
-  AIRFLOW__CELERY__RESULT_BACKEND_CMD: |
+  AIRFLOW__CELERY__RESULT_BACKEND_CMD: |-
     bash -c 'eval "$DATABASE_CELERY_CMD"'
   AIRFLOW__CELERY__WORKER_CONCURRENCY: "{{ .Values.workers.celery.instances }}"
   AIRFLOW__CELERY__WORKER_LOG_SERVER_PORT: "8793"