public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-05 22:27:35 +02:00
Code Issues Projects Releases Wiki Activity

resolve rebase errors

Browse Source
This commit is contained in:
Felix Kunde
2019-11-26 12:30:38 +01:00
parent 68632c5f35
commit 28275444d3
4 changed files with 13 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/reference/cluster_manifest.md
-6
View File
@@ -327,7 +327,6 @@ defined in the sidecar dictionary:
(https://kubernetes.io/docs/tasks/inject-data-application/environment-variable-expose-pod-information/)
for environment variables. Optional.
<<<<<<< HEAD
* **resources**
[CPU and memory requests and limits](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container)
for each sidecar container. Optional.
@@ -355,8 +354,3 @@ CPU and memory limits for the sidecar container.
* **memory**
memory limits for the sidecar container. Optional, overrides the
`default_memory_limits` operator configuration parameter. Optional.
=======
**Note**: The operator will not launch a cluster if sidecar containers are specified
but globally disabled in the configuration. The `enable_sidecars` option
must be set to `true`.
>>>>>>> efce5a5f... updated docs