From 36e63cf91f1553563feff50fadad5f10cf0eb6bb Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Thu, 9 May 2019 12:36:32 +0000 Subject: [PATCH] Synchronize upstreamed folder to 52dc4bce8 --- upstreamed/postgresql/Chart.yaml | 2 +- upstreamed/postgresql/README.md | 10 ++++++++++ .../postgresql/templates/statefulset-slaves.yaml | 10 ++++++++++ upstreamed/postgresql/values-production.yaml | 2 +- upstreamed/postgresql/values.yaml | 2 +- upstreamed/wordpress/Chart.yaml | 2 +- upstreamed/wordpress/README.md | 2 +- 7 files changed, 25 insertions(+), 5 deletions(-) diff --git a/upstreamed/postgresql/Chart.yaml b/upstreamed/postgresql/Chart.yaml index 3ccef208e..405821229 100644 --- a/upstreamed/postgresql/Chart.yaml +++ b/upstreamed/postgresql/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: postgresql -version: 3.18.4 +version: 4.0.0 appVersion: 10.7.0 description: Chart for PostgreSQL, an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance. keywords: diff --git a/upstreamed/postgresql/README.md b/upstreamed/postgresql/README.md index 0d2f4a9d5..71fed6f19 100644 --- a/upstreamed/postgresql/README.md +++ b/upstreamed/postgresql/README.md @@ -298,6 +298,16 @@ This way, the credentials will be available in all of the subcharts. ## Upgrade +### 4.0.0 + +This chart will use by default the Bitnami PostgreSQL container starting from version `10.7.0-r68`. This version moves the initialization logic from node.js to bash. This new version of the chart requires setting the `POSTGRES_PASSWORD` in the slaves as well, in order to properly configure the `pg_hba.conf` file. Users from previous versions of the chart are advised to upgrade immediately. + +IMPORTANT: If you do not want to upgrade the chart version then make sure you use the `10.7.0-r68` version of the container. Otherwise, you will get this error + +``` +The POSTGRESQL_PASSWORD environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow the container to be started with blank passwords. This is recommended only for development +``` + ### 3.0.0 This releases make it possible to specify different nodeSelector, affinity and tolerations for master and slave pods. diff --git a/upstreamed/postgresql/templates/statefulset-slaves.yaml b/upstreamed/postgresql/templates/statefulset-slaves.yaml index 23cee0bc1..04fee94ce 100644 --- a/upstreamed/postgresql/templates/statefulset-slaves.yaml +++ b/upstreamed/postgresql/templates/statefulset-slaves.yaml @@ -116,6 +116,16 @@ spec: value: {{ template "postgresql.fullname" . }} - name: POSTGRES_MASTER_PORT_NUMBER value: {{ include "postgresql.port" . | quote }} + {{- if .Values.usePasswordFile }} + - name: POSTGRES_PASSWORD_FILE + value: "/opt/bitnami/postgresql/secrets/postgresql-password" + {{- else }} + - name: POSTGRES_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "postgresql.secretName" . }} + key: postgresql-password + {{- end }} ports: - name: postgresql containerPort: {{ template "postgresql.port" . }} diff --git a/upstreamed/postgresql/values-production.yaml b/upstreamed/postgresql/values-production.yaml index dcae215c2..8a27e7dc9 100644 --- a/upstreamed/postgresql/values-production.yaml +++ b/upstreamed/postgresql/values-production.yaml @@ -96,7 +96,7 @@ postgresqlUsername: postgres ## PostgreSQL data dir ## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md ## -postgresqlDataDir: /bitnami/postgresql +postgresqlDataDir: /bitnami/postgresql/data ## Specify extra initdb args ## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md diff --git a/upstreamed/postgresql/values.yaml b/upstreamed/postgresql/values.yaml index d4a25d45d..82f965778 100644 --- a/upstreamed/postgresql/values.yaml +++ b/upstreamed/postgresql/values.yaml @@ -102,7 +102,7 @@ postgresqlUsername: postgres ## PostgreSQL data dir ## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md ## -postgresqlDataDir: /bitnami/postgresql +postgresqlDataDir: /bitnami/postgresql/data ## Specify extra initdb args ## ref: https://github.com/bitnami/bitnami-docker-postgresql/blob/master/README.md diff --git a/upstreamed/wordpress/Chart.yaml b/upstreamed/wordpress/Chart.yaml index 345903bba..beab4f015 100644 --- a/upstreamed/wordpress/Chart.yaml +++ b/upstreamed/wordpress/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: wordpress -version: 5.9.2 +version: 5.9.3 appVersion: 5.2.0 description: Web publishing platform for building blogs and websites. icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png diff --git a/upstreamed/wordpress/README.md b/upstreamed/wordpress/README.md index c4eba8fa5..b00960f77 100644 --- a/upstreamed/wordpress/README.md +++ b/upstreamed/wordpress/README.md @@ -71,7 +71,7 @@ The following table lists the configurable parameters of the WordPress chart and | `smtpUser` | SMTP user | `nil` | | `smtpPassword` | SMTP password | `nil` | | `smtpUsername` | User name for SMTP emails | `nil` | -| `smtpProtocol` | SMTP protocol [`tls`, `ssl`] | `nil` | +| `smtpProtocol` | SMTP protocol [`tls`, `ssl`, `none`] | `nil` | | `replicaCount` | Number of WordPress Pods to run | `1` | | `mariadb.enabled` | Deploy MariaDB container(s) | `true` | | `mariadb.rootUser.password` | MariaDB admin password | `nil` |