From 564077df64a58b56ff2c695a30bd180b2a2143fa Mon Sep 17 00:00:00 2001 From: Xinghong Fang Date: Thu, 3 Jan 2019 17:47:24 +0000 Subject: [PATCH] =?UTF-8?q?[stable/airflow]=20revert=20postgres=20sub-char?= =?UTF-8?q?t=20values=20to=20match=20stable/pos=E2=80=A6=20(#10333)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [stable/airflow] revert postgres sub-chart values to match stable/postgresql 0.13.1 I made a mistake in PR https://github.com/helm/charts/pull/9964/ to wrongly reference the latest version of stable/postgresql. This commit will fix the compatibility of this chart with stable/postgresql 0.13.1. Signed-off-by: Xinghong Fang * [stable/airflow] bumping chart version to 0.11.0 Signed-off-by: Xinghong Fang --- stable/airflow/Chart.yaml | 2 +- stable/airflow/README.md | 6 +++--- stable/airflow/templates/configmap-airflow.yaml | 2 +- stable/airflow/templates/secrets.yaml | 4 ++-- stable/airflow/values.yaml | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/stable/airflow/Chart.yaml b/stable/airflow/Chart.yaml index 895cfedf58..af2f204bfa 100644 --- a/stable/airflow/Chart.yaml +++ b/stable/airflow/Chart.yaml @@ -1,6 +1,6 @@ description: Airflow is a platform to programmatically author, schedule and monitor workflows name: airflow -version: 0.10.0 +version: 0.11.0 appVersion: 1.10.0 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 37a8cb3460..047d471196 100644 --- a/stable/airflow/README.md +++ b/stable/airflow/README.md @@ -252,9 +252,9 @@ The following table lists the configurable parameters of the Airflow chart and t | `postgresql.enabled` | create a postgres server | `true` | | `postgresql.uri` | full URL to custom postgres setup | (undefined) | | `postgresql.portgresHost` | PostgreSQL Hostname | (undefined) | -| `postgresql.postgresqlUsername` | PostgreSQL User | `postgres` | -| `postgresql.postgresqlPassword` | PostgreSQL Password | `airflow` | -| `postgresql.postgresqlDatabase` | PostgreSQL Database name | `airflow` | +| `postgresql.postgresUser` | PostgreSQL User | `postgres` | +| `postgresql.postgresPassword` | PostgreSQL Password | `airflow` | +| `postgresql.postgresDatabase` | PostgreSQL Database name | `airflow` | | `postgresql.persistence.enabled` | Enable Postgres PVC | `true` | | `postgresql.persistance.storageClass | Persistant class | (undefined) | | `postgresql.persistance.accessMode` | Access mode | `ReadWriteOnce` | diff --git a/stable/airflow/templates/configmap-airflow.yaml b/stable/airflow/templates/configmap-airflow.yaml index f753f7c757..3c8e7fd3f5 100644 --- a/stable/airflow/templates/configmap-airflow.yaml +++ b/stable/airflow/templates/configmap-airflow.yaml @@ -13,7 +13,7 @@ data: ## Postgres DB configuration POSTGRES_HOST: "{{ template "airflow.postgresql.fullname" . }}" POSTGRES_PORT: "{{ .Values.postgresql.service.port }}" - POSTGRES_DB: "{{ .Values.postgresql.postgresqlDatabase }}" + POSTGRES_DB: "{{ .Values.postgresql.postgresDatabase }}" ## Redis DB configuration REDIS_HOST: "{{ template "airflow.redis.fullname" . }}" REDIS_PORT: "{{ .Values.redis.master.port }}" diff --git a/stable/airflow/templates/secrets.yaml b/stable/airflow/templates/secrets.yaml index 0e20700aac..17e23cdded 100644 --- a/stable/airflow/templates/secrets.yaml +++ b/stable/airflow/templates/secrets.yaml @@ -9,6 +9,6 @@ metadata: heritage: "{{ .Release.Service }}" type: Opaque data: - postgresUser: {{ .Values.postgresql.postgresqlUsername | b64enc | quote }} - postgresPassword: {{ .Values.postgresql.postgresqlPassword | b64enc | quote }} + postgresUser: {{ .Values.postgresql.postgresUser | b64enc | quote }} + postgresPassword: {{ .Values.postgresql.postgresPassword | b64enc | quote }} redisPassword: {{ .Values.redis.password | b64enc | quote }} diff --git a/stable/airflow/values.yaml b/stable/airflow/values.yaml index 64a20676d4..a7ebb88406 100644 --- a/stable/airflow/values.yaml +++ b/stable/airflow/values.yaml @@ -315,14 +315,14 @@ postgresql: service: port: 5432 ## PostgreSQL User to create. - postgresqlUsername: postgres + postgresUser: postgres ## ## PostgreSQL Password for the new user. ## If not set, a random 10 characters password will be used. - postgresqlPassword: airflow + postgresPassword: airflow ## ## PostgreSQL Database to create. - postgresqlDatabase: airflow + postgresDatabase: airflow ## ## Persistent Volume Storage configuration. ## ref: https://kubernetes.io/docs/user-guide/persistent-volumes