public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor fixes

This commit is contained in:
Felix Kunde 2020-01-31 15:33:36 +01:00
parent eb24d729f2
commit efb6731ca6
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charts/postgres-operator/values-crd.yaml
View File

@ -281,8 +281,8 @@ resources:
cpu: 500m cpu: 500m
memory: 500Mi memory: 500Mi
requests: requests:
cpu: 100m cpu: 100m
memory: 250Mi memory: 250Mi
# Affinity for pod assignment # Affinity for pod assignment
# Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity # Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity

4
charts/postgres-operator/values.yaml
View File

@ -257,8 +257,8 @@ resources:
cpu: 500m cpu: 500m
memory: 500Mi memory: 500Mi
requests: requests:
cpu: 100m cpu: 100m
memory: 250Mi memory: 250Mi
# Affinity for pod assignment # Affinity for pod assignment
# Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity # Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity

11
e2e/tests/test_e2e.py
View File

@ -87,7 +87,7 @@ class EndToEndTestCase(unittest.TestCase):
"memory": "50Mi" "memory": "50Mi"
}, },
"limits": { "limits": {
"cpu": "80m", "cpu": "200m",
"memory": "200Mi" "memory": "200Mi"
} }
} }
@ -97,17 +97,17 @@ class EndToEndTestCase(unittest.TestCase):
"acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster", pg_patch_resources) "acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster", pg_patch_resources)
k8s.wait_for_master_failover(failover_targets) k8s.wait_for_master_failover(failover_targets)
pods = self.api.core_v1.list_namespaced_pod( pods = k8s.api.core_v1.list_namespaced_pod(
'default', label_selector='spilo-role=master,' + cluster_label).items 'default', label_selector='spilo-role=master,' + cluster_label).items
self.assert_master_is_unique() self.assert_master_is_unique()
masterPod = pods[0] masterPod = pods[0]
self.assertEqual(masterPod.spec.resources.limits.cpu, minCPULimit, self.assertEqual(masterPod.spec.resources.limits.cpu, minCPULimit,
"Expected CPU limit {}, found {}" "Expected CPU limit {}, found {}"
.format(minCPULimit, masterPod.spec.resources.limits.cpu)) .format(minCPULimit, masterPod.spec.containers[0].resources.limits.cpu))
self.assertEqual(masterPod.spec.resources.limits.memory, "250Mi", self.assertEqual(masterPod.spec.resources.limits.memory, minMemoryLimit,
"Expected memory limit {}, found {}" "Expected memory limit {}, found {}"
.format(minMemoryLimit, masterPod.spec.resources.limits.memory)) .format(minMemoryLimit, masterPod.spec.containers[0].resources.limits.memory))
@timeout_decorator.timeout(TEST_TIMEOUT_SEC) @timeout_decorator.timeout(TEST_TIMEOUT_SEC)
def test_multi_namespace_support(self): def test_multi_namespace_support(self):
@ -130,7 +130,6 @@ class EndToEndTestCase(unittest.TestCase):
''' '''
Scale up from 2 to 3 and back to 2 pods by updating the Postgres manifest at runtime. Scale up from 2 to 3 and back to 2 pods by updating the Postgres manifest at runtime.
''' '''
k8s = self.k8s k8s = self.k8s
labels = "version=acid-minimal-cluster" labels = "version=acid-minimal-cluster"