chart improvements, common labels/annotations

raffis · raffis · commit 79d8ed368d3f · 2021-09-03T17:26:40.000+02:00
diff --git a/chart/prometheus-mongodb-query-exporter/Chart.yaml b/chart/prometheus-mongodb-query-exporter/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.0.0-beta7
+appVersion: v1.0.0-beta7
 description: A Prometheus exporter for MongoDB custom aggregations
 home: https://github.com/raffis/mongodb-query-exporter
 keywords:
@@ -12,4 +12,4 @@ keywords:
 name: prometheus-mongodb-query-exporter
 sources:
 - https://github.com/raffis/mongodb-query-exporter
-version: 1.1.3
+version: 1.1.4
diff --git a/chart/prometheus-mongodb-query-exporter/templates/_helpers.tpl b/chart/prometheus-mongodb-query-exporter/templates/_helpers.tpl
@@ -64,3 +64,17 @@ Determine configmap name, can either be the self-created of an existing one
 {{- end -}}
 {{- end -}}
 
+
+{{/*
+Common labels
+*/}}
+{{- define "prometheus-mongodb-query-exporter.labels" -}}{{- if .Values.chartLabels }}
+    app.kubernetes.io/name: {{ include "prometheus-mongodb-query-exporter.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ include "prometheus-mongodb-query-exporter.chart" . }}
+{{- end -}}
+{{- with .Values.labels }}
+    {{ . | toYaml }}
+{{- end -}}
+{{- end -}}
diff --git a/chart/prometheus-mongodb-query-exporter/templates/configmap.yaml b/chart/prometheus-mongodb-query-exporter/templates/configmap.yaml
@@ -3,13 +3,14 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "prometheus-mongodb-query-exporter.configName" . }}
+  {{- with ( include "prometheus-mongodb-query-exporter.labels" . ) }}
   labels:
-    app.kubernetes.io/name: {{ include "prometheus-mongodb-query-exporter.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    helm.sh/chart: {{ include "prometheus-mongodb-query-exporter.chart" . }}
+    {{- . }}
+  {{- end }}
+  {{- with .Values.annotations }}
   annotations:
-    {{- toYaml .Values.annotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 data:
   config.yaml: |
     {{ .Values.config | nindent 4}}
diff --git a/chart/prometheus-mongodb-query-exporter/templates/deployment.yaml b/chart/prometheus-mongodb-query-exporter/templates/deployment.yaml
@@ -2,13 +2,14 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "prometheus-mongodb-query-exporter.fullname" . }}
+  {{- with ( include "prometheus-mongodb-query-exporter.labels" . ) }}
   labels:
-    app.kubernetes.io/name: {{ include "prometheus-mongodb-query-exporter.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    helm.sh/chart: {{ include "prometheus-mongodb-query-exporter.chart" . }}
+    {{- . }}
+  {{- end }}
+  {{- with .Values.annotations }}
   annotations:
-    {{- toYaml .Values.annotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   replicas: {{ .Values.replicas }}
   selector:
@@ -52,7 +53,7 @@ spec:
         - secretRef:
             name: {{ .Values.envFromSecret }}
         {{- end }}
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         args:
         - --bind={{ printf ":%s" .Values.port }}
@@ -94,15 +95,23 @@ spec:
         secret:
           secretName: {{ .secretName }}
       {{- end }}
+      {{- with .Values.affinity }}
       affinity:
-        {{- toYaml .Values.affinity | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
-        {{- toYaml .Values.imagePullSecrets | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.nodeSelector }}
       nodeSelector:
-        {{- toYaml .Values.nodeSelector | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName }}
       {{- end }}
       terminationGracePeriodSeconds: 30
+      {{- with .Values.tolerations }}
       tolerations:
-        {{- toYaml .Values.tolerations | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/chart/prometheus-mongodb-query-exporter/templates/podsecuritypolicy.yaml b/chart/prometheus-mongodb-query-exporter/templates/podsecuritypolicy.yaml
@@ -3,13 +3,14 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "prometheus-mongodb-query-exporter.fullname" . }}
+  {{- with ( include "prometheus-mongodb-query-exporter.labels" . ) }}
   labels:
-    app.kubernetes.io/name: {{ include "prometheus-mongodb-query-exporter.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    helm.sh/chart: {{ include "prometheus-mongodb-query-exporter.chart" . }}
+    {{- . }}
+  {{- end }}
+  {{- with .Values.annotations }}
   annotations:
-    {{- toYaml .Values.annotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   privileged: false
   allowPrivilegeEscalation: false
diff --git a/chart/prometheus-mongodb-query-exporter/templates/prometheusrule.yaml b/chart/prometheus-mongodb-query-exporter/templates/prometheusrule.yaml
@@ -4,19 +4,18 @@ kind: PrometheusRule
 metadata:
 metadata:
   name: {{ template "prometheus-mongodb-query-exporter.fullname" . }}
-{{- if .Values.prometheusRule.namespace }}
-  namespace: {{ .Values.prometheusRule.namespace }}
-{{- end }}
+  {{- $labels := merge ( include "prometheus-mongodb-query-exporter.labels" . | fromYaml) .Values.prometheusRule.labels -}} 
+  {{- with $labels }}
   labels:
-    app.kubernetes.io/name: {{ include "prometheus-mongodb-query-exporter.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    helm.sh/chart: {{ include "prometheus-mongodb-query-exporter.chart" . }}
-{{- if .Values.prometheusRule.labels }}
-{{- toYaml .Values.prometheusRule.labels | nindent 4 }}
-{{- end }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.annotations }}
   annotations:
-    {{- toYaml .Values.annotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- if .Values.prometheusRule.namespace }}
+  namespace: {{ .Values.prometheusRule.namespace }}
+  {{- end }}
 spec:
 {{- with .Values.prometheusRule.rules }}
   groups:
diff --git a/chart/prometheus-mongodb-query-exporter/templates/role.yaml b/chart/prometheus-mongodb-query-exporter/templates/role.yaml
@@ -3,13 +3,14 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ template "prometheus-mongodb-query-exporter.fullname" . }}
+  {{- with ( include "prometheus-mongodb-query-exporter.labels" . ) }}
   labels:
-    app.kubernetes.io/name: {{ include "prometheus-mongodb-query-exporter.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    helm.sh/chart: {{ include "prometheus-mongodb-query-exporter.chart" . }}
+    {{- . }}
+  {{- end }}
+  {{- with .Values.annotations }}
   annotations:
-    {{- toYaml .Values.annotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 rules:
 - apiGroups: ['extensions']
   resources: ['podsecuritypolicies']
diff --git a/chart/prometheus-mongodb-query-exporter/templates/rolebinding.yaml b/chart/prometheus-mongodb-query-exporter/templates/rolebinding.yaml
@@ -3,13 +3,14 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ template "prometheus-mongodb-query-exporter.fullname" . }}
+  {{- with ( include "prometheus-mongodb-query-exporter.labels" . ) }}
   labels:
-    app.kubernetes.io/name: {{ include "prometheus-mongodb-query-exporter.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    helm.sh/chart: {{ include "prometheus-mongodb-query-exporter.chart" . }}
+    {{- . }}
+  {{- end }}
+  {{- with .Values.annotations }}
   annotations:
-    {{- toYaml .Values.annotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
diff --git a/chart/prometheus-mongodb-query-exporter/templates/secret.yaml b/chart/prometheus-mongodb-query-exporter/templates/secret.yaml
@@ -3,11 +3,14 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "prometheus-mongodb-query-exporter.secretName" . }}
+  {{- with ( include "prometheus-mongodb-query-exporter.labels" . ) }}
   labels:
-    app.kubernetes.io/name: {{ include "prometheus-mongodb-query-exporter.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    helm.sh/chart: {{ include "prometheus-mongodb-query-exporter.chart" . }}
+    {{- . }}
+  {{- end }}
+  {{- with .Values.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 type: Opaque
 data:
   {{- if .Values.mongodb }}
diff --git a/chart/prometheus-mongodb-query-exporter/templates/service.yaml b/chart/prometheus-mongodb-query-exporter/templates/service.yaml
@@ -2,16 +2,15 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "prometheus-mongodb-query-exporter.fullname" . }}
+  {{- $labels := merge ( include "prometheus-mongodb-query-exporter.labels" . | fromYaml) .Values.service.labels -}} 
+  {{- with $labels }}
   labels:
-    app.kubernetes.io/name: {{ include "prometheus-mongodb-query-exporter.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    helm.sh/chart: {{ include "prometheus-mongodb-query-exporter.chart" . }}
-{{- if .Values.service.labels }}
-{{ toYaml .Values.service.labels | indent 4 }}
-{{- end }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.annotations }}
   annotations:
-    {{- toYaml .Values.service.annotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   ports:
     - port: {{ .Values.service.port }}
diff --git a/chart/prometheus-mongodb-query-exporter/templates/serviceaccount.yaml b/chart/prometheus-mongodb-query-exporter/templates/serviceaccount.yaml
@@ -3,11 +3,12 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "prometheus-mongodb-query-exporter.serviceAccountName" . }}
+  {{- with ( include "prometheus-mongodb-query-exporter.labels" . ) }}
   labels:
-    app.kubernetes.io/name: {{ include "prometheus-mongodb-query-exporter.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    helm.sh/chart: {{ include "prometheus-mongodb-query-exporter.chart" . }}
+    {{- . }}
+  {{- end }}
+  {{- with .Values.annotations }}
   annotations:
-    {{- toYaml .Values.annotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 {{- end -}}
diff --git a/chart/prometheus-mongodb-query-exporter/templates/servicemonitor.yaml b/chart/prometheus-mongodb-query-exporter/templates/servicemonitor.yaml
@@ -3,19 +3,18 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "prometheus-mongodb-query-exporter.fullname" . }}
+  {{- $labels := merge ( include "prometheus-mongodb-query-exporter.labels" . | fromYaml) .Values.serviceMonitor.labels -}} 
+  {{- with $labels }}
   labels:
-    app.kubernetes.io/name: {{ include "prometheus-mongodb-query-exporter.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    helm.sh/chart: {{ include "prometheus-mongodb-query-exporter.chart" . }}
-    {{- range $key, $value := .Values.serviceMonitor.additionalLabels }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   {{- if .Values.serviceMonitor.namespace }}
   namespace: {{ .Values.serviceMonitor.namespace }}
   {{- end }}
-  annotations:
-    {{- toYaml .Values.annotations | nindent 4 }}
 spec:
   endpoints:
   - port: metrics
diff --git a/chart/prometheus-mongodb-query-exporter/values.yaml b/chart/prometheus-mongodb-query-exporter/values.yaml
@@ -1,5 +1,9 @@
 affinity: {}
 
+chartLabels: true
+
+labels: {}
+
 annotations: {}
 
 extraArgs:
@@ -9,7 +13,7 @@ fullnameOverride: ""
 image:
   pullPolicy: IfNotPresent
   repository: raffis/mongodb-query-exporter
-  tag: v1.0.0-beta7
+  tag:
 
 imagePullSecrets: []
 
@@ -155,7 +159,7 @@ serviceMonitor:
   interval: 30s
   scrapeTimeout: 10s
   namespace:
-  additionalLabels: {}
+  labels: {}
   targetLabels: []
   metricRelabelings: []
   sampleLimit: 0
