merge with master and resolve conflicts

This commit is contained in:
Felix Kunde
2020-02-19 12:55:40 +01:00
13 changed files with 171 additions and 102 deletions
+1 -1
View File
@@ -155,7 +155,7 @@ configuration they are grouped under the `kubernetes` key.
The default is `postgres-pod`.
* **pod_service_account_definition**
on Postgres cluster creation the operator tries to create the service account
On Postgres cluster creation the operator tries to create the service account
for the Postgres pods if it does not exist in the namespace. The internal
default service account definition (defines only the name) can be overwritten
with this parameter. Make sure to provide a valid YAML or JSON string. The