merge with master

This commit is contained in:
Felix Kunde
2020-10-27 17:02:54 +01:00
18 changed files with 266 additions and 94 deletions
@@ -56,3 +56,7 @@ The following environment variables are accepted by the operator:
* **CRD_READY_WAIT_INTERVAL**
defines the interval between consecutive attempts waiting for the
`postgresql` CRD to be created. The default is 5s.
* **ENABLE_JSON_LOGGING**
Set to `true` for JSON formatted logging output.
The default is false.