Update: Refactoring labels (#27)

Signed-off-by: Nicolas Lamirault <[email protected]>
quickwit-oss · Jan 5, 2023 · 92e89c5 · 92e89c5
1 parent 48ebc0c
commit 92e89c5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/charts/quickwit/Chart.yaml b/charts/quickwit/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: quickwit
 description: Open-Source & Cloud-Native Log Management at any scale.
 type: application
-version: 0.1.13
+version: 0.2.0
 appVersion: "v0.4.0"
 keywords:
 - quickwit

diff --git a/charts/quickwit/templates/_helpers.tpl b/charts/quickwit/templates/_helpers.tpl
@@ -40,6 +40,9 @@ helm.sh/chart: {{ include "quickwit.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.additionalLabels }}
+{{ toYaml .Values.additionalLabels }}
+{{- end }}
 {{- end }}
 
 {{/*

diff --git a/charts/quickwit/templates/servicemonitor.yaml b/charts/quickwit/templates/servicemonitor.yaml
@@ -5,6 +5,9 @@ metadata:
   name: {{ include "quickwit.fullname" . }}
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- with .Values.prometheus.monitor.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   endpoints:
     - path: /metrics

diff --git a/charts/quickwit/values.yaml b/charts/quickwit/values.yaml
@@ -12,6 +12,10 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
+# -- Additional labels to add to all resources
+additionalLabels: {}
+  # app: quickwit
+
 serviceAccount:
   # Specifies whether a service account should be created
   create: true
@@ -322,6 +326,8 @@ config:
 # Prometheus metrics
 serviceMonitor:
   enabled: false
+  # -- Additional labels to add to monitoring resources
+  additionalLabels: {}
   interval: 60s
   scrapeTimeout: 10s
   metricRelabelings: []