Skip to content

Commit 5461f35

Browse files
authored
Add resources field to the pgbouncer-certgenerator container (#760)
1 parent d8002d1 commit 5461f35

3 files changed

Lines changed: 29 additions & 0 deletions

File tree

templates/generate-ssl.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ spec:
8787
imagePullPolicy: IfNotPresent
8888
securityContext:
8989
readOnlyRootFilesystem: true
90+
resources: {{- toYaml .Values.certgenerator.resources | nindent 12 }}
9091
volumeMounts:
9192
- name: tmp
9293
mountPath: /tmp

tests/chart/test_pgbouncer_certgenerator.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,27 @@ def test_pgbouncer_certgenerator_with_sslmode_enabled(self, kube_version):
3636
assert "RoleBinding" == jmespath.search("kind", docs[2])
3737
assert docs[3]["spec"]["template"]["spec"]["affinity"] == {}
3838
assert docs[3]["spec"]["template"]["spec"]["containers"][0]["securityContext"]["readOnlyRootFilesystem"] is True
39+
assert docs[3]["spec"]["template"]["spec"]["containers"][0]["resources"] == {
40+
"limits": {"cpu": "200m", "memory": "256Mi"},
41+
"requests": {"cpu": "100m", "memory": "128Mi"},
42+
}
43+
44+
def test_pgbouncer_certgenerator_resources_are_overridable(self, kube_version):
45+
"""Test that certgenerator.resources overrides the defaults."""
46+
resources = {
47+
"limits": {"cpu": "1", "memory": "1Gi"},
48+
"requests": {"cpu": "500m", "memory": "512Mi"},
49+
}
50+
docs = render_chart(
51+
kube_version=kube_version,
52+
values={
53+
"airflow": {"pgbouncer": {"enabled": True, "sslmode": "require"}},
54+
"certgenerator": {"resources": resources},
55+
},
56+
show_only="templates/generate-ssl.yaml",
57+
)
58+
assert len(docs) == 4
59+
assert docs[3]["spec"]["template"]["spec"]["containers"][0]["resources"] == resources
3960

4061
def test_pgbouncer_certgenerator_with_custom_registry_secret(self, kube_version):
4162
"""Test pgbouncer certgenerator sslmode opts result."""

values.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,6 +1025,13 @@ gitSyncRelay:
10251025
certgenerator:
10261026
extraAnnotations: {}
10271027
affinity: {}
1028+
resources:
1029+
limits:
1030+
cpu: 200m
1031+
memory: 256Mi
1032+
requests:
1033+
cpu: 100m
1034+
memory: 128Mi
10281035

10291036
# Labels that are attached to all pods created by the airflow-chart, but not the sub-charts.
10301037
labels: {}

0 commit comments

Comments
 (0)