merge master and improve standy doc

docs/reference/cluster_manifest.md

@@ -61,8 +61,8 @@ These parameters are grouped directly under  the `spec` key in the manifest.
   It should be a [Spilo](https://github.com/zalando/spilo) image.  Optional.
 
 * **spiloFSGroup**
-  the Persistent Volumes for the spilo pods in the StatefulSet will be owned
-  and writable by the group ID specified. This will override the **spilo_fsgroup**
+  the Persistent Volumes for the spilo pods in the StatefulSet will be owned and
+  writable by the group ID specified. This will override the **spilo_fsgroup**
   operator parameter. This is required to run Spilo as a non-root process, but
   requires a custom spilo image. Note the FSGroup of a Pod cannot be changed
   without recreating a new Pod.
@@ -150,8 +150,8 @@ Those parameters are grouped under the `postgresql` top-level key.
 
 * **parameters**
   a dictionary of postgres parameter names and values to apply to the resulting
-  cluster. Optional (Spilo automatically sets reasonable defaults for
-  parameters like work_mem or max_connections).
+  cluster. Optional (Spilo automatically sets reasonable defaults for parameters
+  like work_mem or max_connections).
 
 
 ## Patroni parameters
@@ -255,8 +255,13 @@ under the `clone` top-level key and do not affect the already running cluster.
   timestamp. When this parameter is set the operator will not consider cloning
   from the live cluster, even if it is running, and instead goes to S3. Optional.
 
+* **s3_wal_path**
+  the url to S3 bucket containing the WAL archive of the cluster to be cloned.
+  Optional.
+
 * **s3_endpoint**
-  the url of the S3-compatible service should be set when cloning from non AWS S3. Optional.
+  the url of the S3-compatible service should be set when cloning from non AWS
+  S3. Optional.
 
 * **s3_access_key_id**
   the access key id, used for authentication on S3 service. Optional.
@@ -265,8 +270,20 @@ under the `clone` top-level key and do not affect the already running cluster.
   the secret access key, used for authentication on S3 service. Optional.
 
 * **s3_force_path_style**
-  to enable path-style addressing(i.e., http://s3.amazonaws.com/BUCKET/KEY) when connecting to an S3-compatible service
-  that lack of support for sub-domain style bucket URLs (i.e., http://BUCKET.s3.amazonaws.com/KEY). Optional.
+  to enable path-style addressing(i.e., http://s3.amazonaws.com/BUCKET/KEY)
+  when connecting to an S3-compatible service that lack of support for
+  sub-domain style bucket URLs (i.e., http://BUCKET.s3.amazonaws.com/KEY).
+  Optional.
+
+## Standby cluster
+
+On startup, an existing `standby` top-level key creates a standby Postgres
+cluster streaming from a remote location. So far only streaming from a S3 WAL
+archive is supported.
+
+* **s3_wal_path**
+  the url to S3 bucket containing the WAL archive of the remote primary.
+  Optional.
 
 ## EBS volume resizing
 
@@ -283,6 +300,9 @@ properties of the persistent storage that stores postgres data.
   documentation](https://kubernetes.io/docs/concepts/storage/storage-classes/)
   for the details on storage classes. Optional.
 
+* **subPath**
+  Subpath to use when mounting volume into Spilo container
+
 ## Sidecar definitions
 
 Those parameters are defined under the `sidecars` key. They consist of a list

docs/reference/operator_parameters.md

@@ -162,6 +162,13 @@ configuration they are grouped under the `kubernetes` key.
   replaced by the cluster name. Only the `{cluster}` placeholders is allowed in
   the template.
 
+* **enable_pod_disruption_budget**
+  PDB is enabled by default to protect the cluster from voluntarily disruptions
+  and hence unwanted DB downtime. However, on some cloud providers it could be
+  necessary to temporarily disabled it, e.g. for node updates. See
+  [admin docs](../administrator.md#pod-disruption-budget) for more information.
+  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
@@ -400,7 +407,13 @@ yet officially supported.
   empty.
 
 * **aws_region**
-  AWS region used to store ESB volumes. The default is `eu-central-1`.
+  AWS region used to store EBS volumes. The default is `eu-central-1`.
+
+* **additional_secret_mount**
+  Additional Secret (aws or gcp credentials) to mount in the pod. The default is empty.
+
+* **additional_secret_mount_path**
+  Path to mount the above Secret in the filesystem of the container(s). The default is empty.
 
   ## Logical backup