update / template labels / use appVersion as tag

Signed-off-by: André Bauer <[email protected]>
prometheus-community · Aug 15, 2023 · ff49ce1 · ff49ce1
1 parent 5aad33e
commit ff49ce1
Show file tree

Hide file tree

Showing 16 changed files with 96 additions and 461 deletions.
diff --git a/charts/prometheus-postgres-exporter/Chart.yaml b/charts/prometheus-postgres-exporter/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "0.13.1"
+appVersion: "v0.13.2"
 description: A Helm chart for prometheus postgres-exporter
 name: prometheus-postgres-exporter
-version: 4.8.0
+version: 5.0.0
 home: https://github.com/prometheus-community/postgres_exporter
 sources:
 - https://github.com/prometheus-community/postgres_exporter

diff --git a/charts/prometheus-postgres-exporter/README.md b/charts/prometheus-postgres-exporter/README.md
@@ -40,6 +40,16 @@ _See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command doc
 
 ## Upgrading
 
+### To 5.0.0
+
+Deprecated options `auto-discover-databases`, `constantLabels`, `exclude-databases` & `include-databases` has been removed.
+Deprecated custom query config has been removed.
+Deprecated PodSecurityPolicy and K8S beta API versions have been removed.
+Chart.yaml appVersion field is used as default image tag.
+Labels are templated now.
+Add default securityContext and PodSecurityContext.
+LivenessProbe timeout has been raised to 3.
+
 ### To 4.6.0
 
 This release adds functionality to template the variables inside `config.datasource` by means of allowing the `tpl` function in the resources that make use of it. This functionality is useful when you want to do sub-charting (e.g. in a postgres chart) and you want to avoid the duplication of variables inside `config.datasource`.

diff --git a/charts/prometheus-postgres-exporter/templates/_helpers.tpl b/charts/prometheus-postgres-exporter/templates/_helpers.tpl
@@ -31,6 +31,25 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Common labels
+*/}}
+{{- define "prometheus-postgres-exporter.labels" -}}
+chart: {{ include "prometheus-postgres-exporter.chart" . }}
+{{ include "prometheus-postgres-exporter.selectorLabels" . }}
+heritage: {{ .Release.Service }}
+{{- if .Values.commonLabels}}
+{{ toYaml .Values.commonLabels }}
+{{- end }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "prometheus-postgres-exporter.selectorLabels" -}}
+app: {{ include "prometheus-postgres-exporter.name" . }}
+release: {{ .Release.Name }}
+{{- end }}
 
 {{/*
 Create the name of the service account to use
@@ -50,23 +69,3 @@ Set DATA_SOURCE_URI environment variable
 {{- define "prometheus-postgres-exporter.data_source_uri" -}}
 {{ printf "%s:%d/%s?sslmode=%s&%s" (tpl .Values.config.datasource.host .) (tpl .Values.config.datasource.port . | int) (tpl .Values.config.datasource.database .) (tpl .Values.config.datasource.sslmode .) (tpl .Values.config.datasource.extraParams .) | trimSuffix "&" | quote }}
 {{- end }}
-
-{{/*
-Return the appropriate apiVersion for rbac.
-*/}}
-{{- define "rbac.apiVersion" -}}
-{{- if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1" }}
-{{- print "rbac.authorization.k8s.io/v1" -}}
-{{- else -}}
-{{- print "rbac.authorization.k8s.io/v1beta1" -}}
-{{- end -}}
-{{- end -}}
-
-{{/* Get Policy API Version */}}
-{{- define "prometheus-postgres-exporter.pdb.apiVersion" -}}
-{{- if .Capabilities.APIVersions.Has "policy/v1" }}
-{{- print "policy/v1" -}}
-{{- else -}}
-{{- print "policy/v1beta1" -}}
-{{- end -}}
-{{- end -}}
diff --git a/charts/prometheus-postgres-exporter/templates/configmap.yaml b/charts/prometheus-postgres-exporter/templates/configmap.yaml
@@ -1,15 +1,10 @@
-{{- if not .Values.config.externalQueries.enabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "prometheus-postgres-exporter.fullname" . }}
   labels:
-    app: {{ template "prometheus-postgres-exporter.name" . }}
-    chart: {{ template "prometheus-postgres-exporter.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    {{- include "prometheus-postgres-exporter.labels" . | nindent 4 }}
 data:
   allow-snippet-annotations: "false"
-  config.yaml: |
-    {{- tpl (mergeOverwrite (tpl .Values.config.queries . | fromYaml) (tpl .Values.config.userQueries . | fromYaml) | toYaml) . | nindent 4 }}
-{{- end }}
+  postgres_exporter.yml: |
+    {{ tpl .Values.config.postgresExporter . | nindent 4 }}
diff --git a/charts/prometheus-postgres-exporter/templates/deployment.yaml b/charts/prometheus-postgres-exporter/templates/deployment.yaml
@@ -6,10 +6,7 @@ kind: Deployment
 metadata:
   name: {{ template "prometheus-postgres-exporter.fullname" . }}
   labels:
-    app: {{ template "prometheus-postgres-exporter.name" . }}
-    chart: {{ template "prometheus-postgres-exporter.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    {{- include "prometheus-postgres-exporter.labels" . | nindent 4 }}
     {{- with .Values.deployment.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -21,21 +18,19 @@ spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ template "prometheus-postgres-exporter.name" . }}
-      release: {{ .Release.Name }}
+      {{- include "prometheus-postgres-exporter.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ template "prometheus-postgres-exporter.name" . }}
-        release: {{ .Release.Name }}
-{{- if .Values.podLabels }}
-{{ toYaml .Values.podLabels | trim | indent 8 }}
-{{- end }}
+        {{- include "prometheus-postgres-exporter.selectorLabels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-{{- if .Values.annotations }}
-{{ toYaml .Values.annotations | indent 8 }}
-{{- end }}
+        {{- with .Values.annotations }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
       serviceAccountName: {{ template "prometheus-postgres-exporter.serviceAccountName" . }}
@@ -56,7 +51,9 @@ spec:
       containers:
         - name: {{ .Chart.Name }}
           args:
-          - "--extend.query-path=/etc/config.yaml"
+          {{- if .Values.config.postgresExporter }}
+          - --config.file=/etc/postgres_exporter.yml
+          {{- end }}
           - "--web.listen-address=:{{ .Values.service.targetPort }}"
           {{- if .Values.config.disableCollectorDatabase }}
           - "--no-collector.database"
@@ -70,21 +67,6 @@ spec:
           {{- if .Values.config.disableSettingsMetrics }}
           - "--disable-settings-metrics"
           {{- end }}
-          {{- if .Values.config.autoDiscoverDatabases }}
-          - "--auto-discover-databases"
-          {{- if .Values.config.excludeDatabases }}
-          - "--exclude-databases"
-          - {{ .Values.config.excludeDatabases | join "," }}
-          {{- end }}
-          {{- if .Values.config.includeDatabases }}
-          - "--include-databases"
-          - {{ .Values.config.includeDatabases | join "," }}
-          {{- end }}
-          {{- end }}
-          {{- if .Values.config.constantLabels }}
-          {{ $firstLabel := true -}}
-          - "--constantLabels={{- range $k, $v := .Values.config.constantLabels }}{{- if not $firstLabel -}},{{ end -}}{{ $firstLabel = false -}}{{ $k }}={{ $v }}{{- end }}"
-          {{- end }}
           {{- if .Values.config.logLevel }}
           - "--log.level={{ .Values.config.logLevel }}"
           {{- end}}
@@ -148,7 +130,7 @@ spec:
           {{ toYaml . | nindent 10 }}
           {{- end }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           {{- with .Values.command }}
           command:
@@ -177,12 +159,14 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           volumeMounts:
-            - name: queries
-              mountPath: /etc/config.yaml
-              subPath: config.yaml
-{{- with .Values.extraVolumeMounts }}
-{{ toYaml . | indent 12 }}
-{{- end }}
+            {{- if .Values.config.postgresExporter }}
+            - name: postgres-exporter
+              mountPath: /etc/postgres_exporter.yml
+              subPath: postgres_exporter.yml
+            {{- end }}  
+            {{- with .Values.extraVolumeMounts }}
+            {{ toYaml . | nindent 12 }}
+            {{- end }}
 {{- with .Values.extraContainers }}
 {{ toYaml . | indent 8 }}
 {{- end }}
@@ -203,14 +187,12 @@ spec:
 {{ toYaml . | indent 8 }}
     {{- end }}
       volumes:
+      {{- if .Values.config.postgresExporter }}
       - configMap:
           defaultMode: 420
-          {{- if not .Values.config.externalQueries.enabled }}
           name: {{ template "prometheus-postgres-exporter.fullname" . }}
-          {{- else }}
-          name: {{ .Values.config.externalQueries.configmap }}
-          {{- end }}
-        name: queries
-{{- with .Values.extraVolumes }}
-{{ toYaml . | indent 6 }}
-{{- end }}
+        name: postgres-exporter
+      {{- end }}
+      {{- with .Values.extraVolumes }}
+      {{ toYaml . | nindent 6 }}
+      {{- end }}
diff --git a/charts/prometheus-postgres-exporter/templates/networkpolicy.yaml b/charts/prometheus-postgres-exporter/templates/networkpolicy.yaml
@@ -4,14 +4,14 @@ kind: NetworkPolicy
 metadata:
   name: {{ template "prometheus-postgres-exporter.fullname" . }}
   labels:
+    {{- include "prometheus-postgres-exporter.labels" . | nindent 4 }}
     {{- if .Values.networkPolicy.labels }}
       {{ toYaml .Values.networkPolicy.labels | indent 4 }}
     {{- end }}
 spec:
   podSelector:
     matchLabels:
-      app: {{ template "prometheus-postgres-exporter.name" . }}
-      release: {{ .Release.Name }}
+      {{- include "prometheus-postgres-exporter.selectorLabels" . | nindent 6 }}
   policyTypes:
     - Ingress
   ingress:

diff --git a/charts/prometheus-postgres-exporter/templates/pdb.yaml b/charts/prometheus-postgres-exporter/templates/pdb.yaml
@@ -1,17 +1,13 @@
 {{- if .Values.podDisruptionBudget.enabled }}
-apiVersion: {{ include "prometheus-postgres-exporter.pdb.apiVersion" . }}
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "prometheus-postgres-exporter.fullname" . }}
   labels:
-    app: {{ template "prometheus-postgres-exporter.name" . }}
-    chart: {{ template "prometheus-postgres-exporter.chart" . }}
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    {{- include "prometheus-postgres-exporter.labels" . | nindent 4 }}
 spec:
   maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
   selector:
     matchLabels:
-      app: {{ template "prometheus-postgres-exporter.name" . }}
-      release: {{ .Release.Name }}
+      {{- include "prometheus-postgres-exporter.selectorLabels" . | nindent 6 }}
 {{- end }}
diff --git a/charts/prometheus-postgres-exporter/templates/podsecuritypolicy.yaml b/charts/prometheus-postgres-exporter/templates/podsecuritypolicy.yaml
diff --git a/charts/prometheus-postgres-exporter/templates/prometheusrule.yaml b/charts/prometheus-postgres-exporter/templates/prometheusrule.yaml
@@ -7,10 +7,7 @@ metadata:
   namespace: {{ . }}
 {{- end }}
   labels:
-    app: {{ template "prometheus-postgres-exporter.name" . }}
-    chart: {{ template "prometheus-postgres-exporter.chart" . }}
-    release: {{ .Release.Name | quote }}
-    heritage: {{ .Release.Service | quote }}
+    {{- include "prometheus-postgres-exporter.labels" . | nindent 4 }}
 {{- with .Values.prometheusRule.additionalLabels }}
 {{ toYaml . | indent 4 }}
 {{- end }}

diff --git a/charts/prometheus-postgres-exporter/templates/role.yaml b/charts/prometheus-postgres-exporter/templates/role.yaml
@@ -1,18 +1,8 @@
 {{- if .Values.rbac.create }}
-apiVersion: {{ template "rbac.apiVersion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ template "prometheus-postgres-exporter.fullname" . }}
   labels:
-    app: {{ template "prometheus-postgres-exporter.name" . }}
-    chart: {{ template "prometheus-postgres-exporter.chart" . }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
-{{- if and .Values.rbac.pspEnabled (.Capabilities.APIVersions.Has "policy/v1beta1/PodSecurityPolicy") }}
-rules:
-- apiGroups:      ['extensions']
-  resources:      ['podsecuritypolicies']
-  verbs:          ['use']
-  resourceNames:  [{{ template "prometheus-postgres-exporter.fullname" . }}]
-{{- end }}
+    {{- include "prometheus-postgres-exporter.labels" . | nindent 4 }}
 {{- end }}
diff --git a/charts/prometheus-postgres-exporter/templates/rolebinding.yaml b/charts/prometheus-postgres-exporter/templates/rolebinding.yaml
@@ -1,13 +1,10 @@
 {{- if .Values.rbac.create -}}
-apiVersion: {{ template "rbac.apiVersion" . }}
+apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ template "prometheus-postgres-exporter.fullname" . }}
   labels:
-    app: {{ template "prometheus-postgres-exporter.name" . }}
-    chart: {{ template "prometheus-postgres-exporter.chart" . }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    {{- include "prometheus-postgres-exporter.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/charts/prometheus-postgres-exporter/templates/secrets.yaml b/charts/prometheus-postgres-exporter/templates/secrets.yaml
@@ -4,10 +4,7 @@ kind: Secret
 metadata:
   name: {{ template "prometheus-postgres-exporter.fullname" . }}
   labels:
-    app: {{ template "prometheus-postgres-exporter.name" . }}
-    chart: {{ template "prometheus-postgres-exporter.chart" . }}
-    heritage: {{ .Release.Service }}
-    release: {{ .Release.Name }}
+    {{- include "prometheus-postgres-exporter.labels" . | nindent 4 }}
 type: Opaque
 data:
   data_source_password: {{ tpl (.Values.config.datasource.password | default "somepaswword") . | b64enc }}

diff --git a/charts/prometheus-postgres-exporter/templates/service.yaml b/charts/prometheus-postgres-exporter/templates/service.yaml
@@ -7,10 +7,7 @@ metadata:
 {{ toYaml .Values.service.annotations | indent 4 }}
 {{- end }}
   labels:
-    app: {{ template "prometheus-postgres-exporter.name" . }}
-    chart: {{ template "prometheus-postgres-exporter.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    {{- include "prometheus-postgres-exporter.labels" . | nindent 4 }}
 {{- if .Values.service.labels }}
 {{ toYaml .Values.service.labels | trim | indent 4 }}
 {{- end }}
@@ -22,5 +19,4 @@ spec:
       protocol: TCP
       name: {{ .Values.service.name }}
   selector:
-    app: {{ template "prometheus-postgres-exporter.name" . }}
-    release: {{ .Release.Name }}
+    {{- include "prometheus-postgres-exporter.selectorLabels" . | nindent 4 }}
diff --git a/charts/prometheus-postgres-exporter/templates/serviceaccount.yaml b/charts/prometheus-postgres-exporter/templates/serviceaccount.yaml
@@ -5,10 +5,7 @@ automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
 metadata:
   name: {{ template "prometheus-postgres-exporter.serviceAccountName" . }}
   labels:
-    app: {{ template "prometheus-postgres-exporter.name" . }}
-    chart: {{ template "prometheus-postgres-exporter.chart" . }}
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
+    {{- include "prometheus-postgres-exporter.labels" . | nindent 4 }}
   {{- if .Values.serviceAccount.annotations }}
   annotations:
     {{ toYaml .Values.serviceAccount.annotations }}