Refactoring Kubernetes recommanded labels

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.14
+version: 0.5.15
 appVersion: "v0.8.1"
 keywords:
   - quickwit

charts/quickwit/templates/_helpers.tpl

@@ -49,6 +49,7 @@ helm.sh/chart: {{ include "quickwit.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+app.kubernetes.io/part-of: quickwit
 {{ include "quickwit.additionalLabels" . }}
 {{- end }}
 
@@ -64,39 +65,34 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 Searcher Selector labels
 */}}
 {{- define "quickwit.searcher.selectorLabels" -}}
-{{ include "quickwit.selectorLabels" . }}
 app.kubernetes.io/component: searcher
 {{- end }}
 
 {{/*
 Janitor Selector labels
 */}}
 {{- define "quickwit.janitor.selectorLabels" -}}
-{{ include "quickwit.selectorLabels" . }}
 app.kubernetes.io/component: janitor
 {{- end }}
 
 {{/*
 Metastore Selector labels
 */}}
 {{- define "quickwit.metastore.selectorLabels" -}}
-{{ include "quickwit.selectorLabels" . }}
 app.kubernetes.io/component: metastore
 {{- end }}
 
 {{/*
 Control Plane Selector labels
 */}}
 {{- define "quickwit.control_plane.selectorLabels" -}}
-{{ include "quickwit.selectorLabels" . }}
 app.kubernetes.io/component: control-plane
 {{- end }}
 
 {{/*
 Indexer Selector labels
 */}}
 {{- define "quickwit.indexer.selectorLabels" -}}
-{{ include "quickwit.selectorLabels" . }}
 app.kubernetes.io/component: indexer
 {{- end }}
 

charts/quickwit/templates/configmap-bootstrap.yaml

@@ -5,6 +5,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}-bootstrap
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    app.kubernetes.io/component: config
 data:
   {{- range .Values.config.indexes }}
   {{ .index_id }}.yaml: |-

charts/quickwit/templates/configmap.yaml

@@ -4,6 +4,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    app.kubernetes.io/component: config
 data:
   node.yaml: |-
     version: 0.8

charts/quickwit/templates/control-plane-deployment.yaml

@@ -3,7 +3,8 @@ kind: Deployment
 metadata:
   name: {{ include "quickwit.fullname" . }}-control-plane
   labels:
-    {{- include "quickwit.labels" . | nindent 4 }}  
+    {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.control_plane.selectorLabels" . | nindent 4 }}
   annotations:
     {{- with .Values.annotations }}
     {{- toYaml . | nindent 4 }}
@@ -15,6 +16,7 @@ spec:
   replicas: 1
   selector:
     matchLabels:
+      {{- include "quickwit.selectorLabels" . | nindent 6 }}
       {{- include "quickwit.control_plane.selectorLabels" . | nindent 6 }}
   strategy:
     type: Recreate
@@ -29,8 +31,9 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "quickwit.additionalLabels" . | nindent 8 }}
+        {{- include "quickwit.labels" . | nindent 8 }}
         {{- include "quickwit.control_plane.selectorLabels" . | nindent 8 }}
+        {{- include "quickwit.additionalLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

charts/quickwit/templates/prometheusrule.yaml

@@ -5,6 +5,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    app.kubernetes.io/component: metrics
 spec:
   groups:
     - name: {{ include "quickwit.fullname" . }}

charts/quickwit/templates/secret.yaml

@@ -4,6 +4,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    app.kubernetes.io/component: secret
 type: Opaque
 data:
 {{- if .Values.config.postgres }}

charts/quickwit/templates/service.yaml

@@ -4,6 +4,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}-searcher
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.searcher.selectorLabels" . | nindent 4 }}
   annotations:
     {{- with .Values.service.annotations }}
     {{- toYaml . | nindent 4 }}
@@ -60,6 +61,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}-indexer
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.indexer.selectorLabels" . | nindent 4 }}
   annotations:
     {{- with .Values.service.annotations }}
     {{- toYaml . | nindent 4 }}
@@ -86,6 +88,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}-metastore
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.metastore.selectorLabels" . | nindent 4 }}
   annotations:
     {{- with .Values.service.annotations }}
     {{- toYaml . | nindent 4 }}
@@ -112,6 +115,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}-control-plane
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.control_plane.selectorLabels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -124,14 +128,14 @@ spec:
       name: grpc
   selector:
     {{- include "quickwit.control_plane.selectorLabels" . | nindent 4 }}
-
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "quickwit.fullname" . }}-janitor
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.janitor.selectorLabels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:

charts/quickwit/templates/serviceaccount.yaml

@@ -4,7 +4,8 @@ kind: ServiceAccount
 metadata:
   name: {{ include "quickwit.serviceAccountName" . }}
   labels:
-    {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.labels" . | nindent 4 -}}
+    app.kubernetes.io/component: rbac
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

charts/quickwit/templates/servicemonitor.yaml

@@ -5,6 +5,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    app.kubernetes.io/component: metrics
 spec:
   endpoints:
     - path: /metrics