Merge pull request #75 from quickwit-oss/fix-duplicated-tags

Fix duplicate labels
quickwit-oss · Apr 3, 2024 · f021ef4 · f021ef4
2 parents 24e5eb8 + d5d67b6
commit f021ef4
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 9 deletions.
diff --git a/charts/quickwit/Chart.yaml b/charts/quickwit/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: quickwit
 description: Sub-second search & analytics engine on cloud storage.
 type: application
-version: 0.5.11
+version: 0.5.12
 appVersion: "v0.8.1"
 keywords:
   - quickwit

diff --git a/charts/quickwit/templates/_helpers.tpl b/charts/quickwit/templates/_helpers.tpl
@@ -30,6 +30,15 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
+{{/*
+Custom labels
+*/}}
+{{- define "quickwit.additionalLabels" -}}
+{{- if .Values.additionalLabels }}
+{{ toYaml .Values.additionalLabels }}
+{{- end }}
+{{- end }}
+
 {{/*
 Common labels
 */}}
@@ -40,9 +49,7 @@ 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 }}
+{{ include "quickwit.additionalLabels" . }}
 {{- end }}
 
 {{/*

diff --git a/charts/quickwit/templates/control-plane-deployment.yaml b/charts/quickwit/templates/control-plane-deployment.yaml
@@ -19,7 +19,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "quickwit.labels" . | nindent 8 }}
+        {{- include "quickwit.additionalLabels" . | nindent 8 }}
         {{- include "quickwit.control_plane.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}

diff --git a/charts/quickwit/templates/indexer-statefulset.yaml b/charts/quickwit/templates/indexer-statefulset.yaml
@@ -23,7 +23,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "quickwit.labels" . | nindent 8 }}
+        {{- include "quickwit.additionalLabels" . | nindent 8 }}
         {{- include "quickwit.indexer.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}

diff --git a/charts/quickwit/templates/janitor-deployment.yaml b/charts/quickwit/templates/janitor-deployment.yaml
@@ -20,7 +20,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "quickwit.labels" . | nindent 8 }}
+        {{- include "quickwit.additionalLabels" . | nindent 8 }}
         {{- include "quickwit.janitor.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}

diff --git a/charts/quickwit/templates/metastore-deployment.yaml b/charts/quickwit/templates/metastore-deployment.yaml
@@ -18,7 +18,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "quickwit.labels" . | nindent 8 }}
+        {{- include "quickwit.additionalLabels" . | nindent 8 }}
         {{- include "quickwit.metastore.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}

diff --git a/charts/quickwit/templates/searcher-statefulset.yaml b/charts/quickwit/templates/searcher-statefulset.yaml
@@ -23,7 +23,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "quickwit.labels" . | nindent 8 }}
+        {{- include "quickwit.additionalLabels" . | nindent 8 }}
         {{- include "quickwit.searcher.selectorLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}