Merge branch 'master' into validate-resources

docs/reference/operator_parameters.md

@@ -87,9 +87,9 @@ Those are top-level keys, containing both leaf keys and groups.
   repository](https://github.com/zalando/spilo).
 
 * **sidecar_docker_images**
-  a map of sidecar names to docker images for the containers to run alongside
-  Spilo. In case of the name conflict with the definition in the cluster
-  manifest the cluster-specific one is preferred.
+  a map of sidecar names to docker images to run with Spilo. In case of the name
+  conflict with the definition in the cluster manifest the cluster-specific one
+  is preferred.
 
 * **enable_shm_volume**
   Instruct operator to start any new database pod without limitations on shm
@@ -196,6 +196,14 @@ configuration they are grouped under the `kubernetes` key.
   [admin docs](../administrator.md#pod-disruption-budget) for more information.
   Default is true.
 
+* **enable_init_containers**
+  global option to allow for creating init containers to run actions before
+  Spilo is started. Default is true.
+
+* **enable_sidecars**
+  global option to allow for creating sidecar containers to run alongside Spilo
+  on the same pod. Default is true.
+
 * **secret_name_template**
   a template for the name of the database user secrets generated by the
   operator. `{username}` is replaced with name of the secret, `{cluster}` with

docs/user.md

@@ -379,6 +379,10 @@ variables are always passed to sidecars:
 The PostgreSQL volume is shared with sidecars and is mounted at
 `/home/postgres/pgdata`.
 
+**Note**: The operator will not create a cluster if sidecar containers are
+specified but globally disabled in the configuration. The `enable_sidecars`
+option must be set to `true`.
+
 ## InitContainers Support
 
 Each cluster can specify arbitrary init containers to run. These containers can
@@ -403,6 +407,10 @@ spec:
 
 `initContainers` accepts full `v1.Container` definition.
 
+**Note**: The operator will not create a cluster if `initContainers` are
+specified but globally disabled in the configuration. The
+`enable_init_containers` option must be set to `true`.
+
 ## Increase volume size
 
 Postgres operator supports statefulset volume resize if you're using the