Skip to content

feat: add extra annotations pgbouncer #30168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jedcunningham merged 9 commits into from
Apr 10, 2023
Merged

feat: add extra annotations pgbouncer #30168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7663ead
feat: add extra annotations pgbouncer
dim-ops Mar 18, 2023
10f6f1d
fix(ci): Static checks
dim-ops Mar 20, 2023
dbfbe94
fix(ci): Static checks
dim-ops Mar 21, 2023
99e1cb7
fix(ci): Static checks E501 Line too long
dim-ops Mar 22, 2023
2f690ba
chore(helm): fmt
dim-ops Apr 9, 2023
be7dbba
chore(helm): rename pgbouncer annotations
dim-ops Apr 9, 2023
4dea5de
chore(test): modify coverage
dim-ops Apr 9, 2023
b685ac0
chore(helm): rename pgbouncer annotations
dim-ops Apr 9, 2023
113d127
fix: add enable pgbouncer UT
dim-ops Apr 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions chart/templates/pgbouncer/pgbouncer-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ spec:
annotations:
checksum/pgbouncer-config-secret: {{ include (print $.Template.BasePath "/secrets/pgbouncer-config-secret.yaml") . | sha256sum }}
checksum/pgbouncer-certificates-secret: {{ include (print $.Template.BasePath "/secrets/pgbouncer-certificates-secret.yaml") . | sha256sum }}
{{- if .Values.pgbouncer.podAnnotations }}
{{- toYaml .Values.pgbouncer.podAnnotations | nindent 8 }}
{{- end }}
spec:
{{- if .Values.pgbouncer.priorityClassName }}
priorityClassName: {{ .Values.pgbouncer.priorityClassName }}
Expand Down
8 changes: 8 additions & 0 deletions chart/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4385,6 +4385,14 @@
],
"default": null
},
"podAnnotations": {
"description": "Add annotations for the PgBouncer Pod.",
"type": "object",
"default": {},
"additionalProperties": {
"type": "string"
}
},
"podDisruptionBudget": {
"description": "PgBouncer PodDisruptionBudget.",
"type": "object",
Expand Down
2 changes: 2 additions & 0 deletions chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1542,6 +1542,8 @@ pgbouncer:
# annotations to be added to the PgBouncer deployment
annotations: {}

podAnnotations: {}

# Create ServiceAccount
serviceAccount:
# Specifies whether a ServiceAccount should be created
Expand Down
14 changes: 14 additions & 0 deletions tests/charts/test_annotations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,20 @@ def test_annotations_are_added(self, values, show_only, expected_annotations):
"example": "statsd",
},
),
(
{
"pgbouncer": {
"enabled": True,
"podAnnotations": {
"example": "pgbouncer",
},
},
},
"templates/pgbouncer/pgbouncer-deployment.yaml",
{
"example": "pgbouncer",
},
),
],
)
class TestPerComponentPodAnnotations:
Expand Down