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

1) Handle per-cluster sidecars 2) Add this option to operator CRD 3) ad parsing for proepr comparison

Browse Source
This commit is contained in:
Sergey Dudoladov
2018-11-08 18:41:23 +01:00
parent 047368b612
commit c6df079d2b
5 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/k8sres.go
+12 -2
View File
@@ -647,12 +647,22 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*v1beta1.State
if c.OpConfig.SetMemoryRequestToLimit {
if spec.Resources.ResourceLimits.Memory > spec.Resources.ResourceRequests.Memory {
if util.RequestIsSmallerThanLimit(spec.Resources.ResourceRequests.Memory, spec.Resources.ResourceLimits.Memory) {
c.logger.Warningf("The memory request of %v for the Postgres container is increased to match the memory limit of %v.", spec.Resources.ResourceRequests.Memory, spec.Resources.ResourceLimits.Memory)
spec.Resources.ResourceRequests.Memory = spec.Resources.ResourceLimits.Memory
}
// controller adjusts default and Spilo sidecar container requests (those do not need Sync)
// adjust sidecar containers defined for that particular cluster
for _, sidecar := range spec.Sidecars {
if util.RequestIsSmallerThanLimit(sidecar.Resources.ResourceRequests.Memory, sidecar.Resources.ResourceLimits.Memory) {
c.logger.Warningf("The memory request of %v for the %v sidecar container is increased to match the memory limit of %v.", sidecar.Resources.ResourceRequests.Memory, sidecar.Name, sidecar.Resources.ResourceLimits.Memory)
sidecar.Resources.ResourceRequests.Memory = sidecar.Resources.ResourceLimits.Memory
}
}
// controller adjusts default memory request and Scalyr sidecar container's request
// as those do not need to be synced
}