Skip to content

Commit

Permalink
Extend podLabel configurations (#54)
Browse files Browse the repository at this point in the history
* Add podlabels to db instances' pg exporter

* Separate db-operator controller and webhook podlabels

* Update chart versions
  • Loading branch information
bobertrublik authored Jun 25, 2024
1 parent c7fc825 commit c083fea
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion charts/db-instances/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: Database Instances for db operator
name: db-instances
version: 2.3.3
version: 2.3.4
3 changes: 3 additions & 0 deletions charts/db-instances/templates/postgres_exporter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ spec:
labels:
{{- include "db-instances.labels" $ | nindent 8 }}
db-instance: {{ $name }}
{{- with $value.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
containers:
- env:
Expand Down
2 changes: 1 addition & 1 deletion charts/db-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
type: application
name: db-operator
version: 1.27.0
version: 1.27.1
# ---------------------------------------------------------------------------------
# -- All supported k8s versions are in the test:
# -- https://github.com/db-operator/charts/blob/main/.github/workflows/test.yaml
Expand Down
4 changes: 2 additions & 2 deletions charts/db-operator/templates/webhook/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ spec:
labels:
{{- include "labels" . | nindent 8 }}
app.kubernetes.io/component: "webhook"
{{- if .Values.podLabels }}
{{ toYaml .Values.podLabels | trim | nindent 8 }}
{{- if .Values.webhook.podLabels }}
{{ toYaml .Values.webhook.podLabels | trim | nindent 8 }}
{{- end }}
{{- if .Values.annotations }}
annotations:
Expand Down
1 change: 1 addition & 0 deletions charts/db-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ crds:
annotations: {}
webhook:
enabled: true
podLabels: {}
serviceAccount:
create: true
names:
Expand Down

0 comments on commit c083fea

Please sign in to comment.