From 626eccba6402fe4f9be6ed9103ad1eed7cf07622 Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Thu, 2 May 2024 10:29:52 +0200
Subject: [PATCH 01/11] Cleanup Kubernetes recommanded labels

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 charts/quickwit/templates/_helpers.tpl                  | 6 +-----
 charts/quickwit/templates/configmap-bootstrap.yaml      | 3 ++-
 charts/quickwit/templates/configmap.yaml                | 3 ++-
 charts/quickwit/templates/control-plane-deployment.yaml | 7 +++++--
 charts/quickwit/templates/prometheusrule.yaml           | 1 +
 charts/quickwit/templates/secret.yaml                   | 3 ++-
 charts/quickwit/templates/service.yaml                  | 6 +++++-
 charts/quickwit/templates/serviceaccount.yaml           | 3 ++-
 charts/quickwit/templates/servicemonitor.yaml           | 1 +
 9 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/charts/quickwit/templates/_helpers.tpl b/charts/quickwit/templates/_helpers.tpl
index 73c37d6..228aae1 100644
--- a/charts/quickwit/templates/_helpers.tpl
+++ b/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,7 +65,6 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 Searcher Selector labels
 */}}
 {{- define "quickwit.searcher.selectorLabels" -}}
-{{ include "quickwit.selectorLabels" . }}
 app.kubernetes.io/component: searcher
 {{- end }}
 
@@ -72,7 +72,6 @@ app.kubernetes.io/component: searcher
 Janitor Selector labels
 */}}
 {{- define "quickwit.janitor.selectorLabels" -}}
-{{ include "quickwit.selectorLabels" . }}
 app.kubernetes.io/component: janitor
 {{- end }}
 
@@ -80,7 +79,6 @@ app.kubernetes.io/component: janitor
 Metastore Selector labels
 */}}
 {{- define "quickwit.metastore.selectorLabels" -}}
-{{ include "quickwit.selectorLabels" . }}
 app.kubernetes.io/component: metastore
 {{- end }}
 
@@ -88,7 +86,6 @@ app.kubernetes.io/component: metastore
 Control Plane Selector labels
 */}}
 {{- define "quickwit.control_plane.selectorLabels" -}}
-{{ include "quickwit.selectorLabels" . }}
 app.kubernetes.io/component: control-plane
 {{- end }}
 
@@ -96,7 +93,6 @@ app.kubernetes.io/component: control-plane
 Indexer Selector labels
 */}}
 {{- define "quickwit.indexer.selectorLabels" -}}
-{{ include "quickwit.selectorLabels" . }}
 app.kubernetes.io/component: indexer
 {{- end }}
 
diff --git a/charts/quickwit/templates/configmap-bootstrap.yaml b/charts/quickwit/templates/configmap-bootstrap.yaml
index 5c5c613..8b923d6 100644
--- a/charts/quickwit/templates/configmap-bootstrap.yaml
+++ b/charts/quickwit/templates/configmap-bootstrap.yaml
@@ -4,7 +4,8 @@ kind: ConfigMap
 metadata:
   name: {{ include "quickwit.fullname" . }}-bootstrap
   labels:
-    {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.labels" . | nindent 4 -}}
+    app.kubernetes.io/component: config
 data:
   {{- range .Values.config.indexes }}
   {{ .index_id }}.yaml: |-
diff --git a/charts/quickwit/templates/configmap.yaml b/charts/quickwit/templates/configmap.yaml
index 42cc9e3..1d618bd 100644
--- a/charts/quickwit/templates/configmap.yaml
+++ b/charts/quickwit/templates/configmap.yaml
@@ -3,7 +3,8 @@ kind: ConfigMap
 metadata:
   name: {{ include "quickwit.fullname" . }}
   labels:
-    {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.labels" . | nindent 4 -}}
+    app.kubernetes.io/component: config
 data:
   node.yaml: |-
     version: 0.8
diff --git a/charts/quickwit/templates/control-plane-deployment.yaml b/charts/quickwit/templates/control-plane-deployment.yaml
index 3bf5d2b..a2b0fb3 100644
--- a/charts/quickwit/templates/control-plane-deployment.yaml
+++ b/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:
diff --git a/charts/quickwit/templates/prometheusrule.yaml b/charts/quickwit/templates/prometheusrule.yaml
index 48ad10b..52b0d29 100644
--- a/charts/quickwit/templates/prometheusrule.yaml
+++ b/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" . }}
diff --git a/charts/quickwit/templates/secret.yaml b/charts/quickwit/templates/secret.yaml
index f2d8084..6082f20 100644
--- a/charts/quickwit/templates/secret.yaml
+++ b/charts/quickwit/templates/secret.yaml
@@ -3,7 +3,8 @@ kind: Secret
 metadata:
   name: {{ include "quickwit.fullname" . }}
   labels:
-    {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.labels" . | nindent 4 -}}
+    app.kubernetes.io/component: secret
 type: Opaque
 data:
 {{- if .Values.config.postgres }}
diff --git a/charts/quickwit/templates/service.yaml b/charts/quickwit/templates/service.yaml
index cdb0d5c..115948f 100644
--- a/charts/quickwit/templates/service.yaml
+++ b/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,7 +128,6 @@ spec:
       name: grpc
   selector:
     {{- include "quickwit.control_plane.selectorLabels" . | nindent 4 }}
-
 ---
 apiVersion: v1
 kind: Service
@@ -132,6 +135,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}-janitor
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.janitor.selectorLabels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:
diff --git a/charts/quickwit/templates/serviceaccount.yaml b/charts/quickwit/templates/serviceaccount.yaml
index 5f9d6a7..515f7ab 100644
--- a/charts/quickwit/templates/serviceaccount.yaml
+++ b/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 }}
diff --git a/charts/quickwit/templates/servicemonitor.yaml b/charts/quickwit/templates/servicemonitor.yaml
index 492b047..04d6bea 100644
--- a/charts/quickwit/templates/servicemonitor.yaml
+++ b/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

From d2f7137f7b8e5aa9f89a40dac83fe430b6297cbd Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Thu, 2 May 2024 10:31:24 +0200
Subject: [PATCH 02/11] fix: typo

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 charts/quickwit/templates/configmap-bootstrap.yaml | 2 +-
 charts/quickwit/templates/configmap.yaml           | 2 +-
 charts/quickwit/templates/secret.yaml              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/quickwit/templates/configmap-bootstrap.yaml b/charts/quickwit/templates/configmap-bootstrap.yaml
index 8b923d6..9582f7d 100644
--- a/charts/quickwit/templates/configmap-bootstrap.yaml
+++ b/charts/quickwit/templates/configmap-bootstrap.yaml
@@ -4,7 +4,7 @@ kind: ConfigMap
 metadata:
   name: {{ include "quickwit.fullname" . }}-bootstrap
   labels:
-    {{- include "quickwit.labels" . | nindent 4 -}}
+    {{- include "quickwit.labels" . | nindent 4 }}
     app.kubernetes.io/component: config
 data:
   {{- range .Values.config.indexes }}
diff --git a/charts/quickwit/templates/configmap.yaml b/charts/quickwit/templates/configmap.yaml
index 1d618bd..775c52d 100644
--- a/charts/quickwit/templates/configmap.yaml
+++ b/charts/quickwit/templates/configmap.yaml
@@ -3,7 +3,7 @@ kind: ConfigMap
 metadata:
   name: {{ include "quickwit.fullname" . }}
   labels:
-    {{- include "quickwit.labels" . | nindent 4 -}}
+    {{- include "quickwit.labels" . | nindent 4 }}
     app.kubernetes.io/component: config
 data:
   node.yaml: |-
diff --git a/charts/quickwit/templates/secret.yaml b/charts/quickwit/templates/secret.yaml
index 6082f20..61d29ba 100644
--- a/charts/quickwit/templates/secret.yaml
+++ b/charts/quickwit/templates/secret.yaml
@@ -3,7 +3,7 @@ kind: Secret
 metadata:
   name: {{ include "quickwit.fullname" . }}
   labels:
-    {{- include "quickwit.labels" . | nindent 4 -}}
+    {{- include "quickwit.labels" . | nindent 4 }}
     app.kubernetes.io/component: secret
 type: Opaque
 data:

From 2f0e6ebcf9f25d13e1cb9b12215081baa00095c7 Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Thu, 2 May 2024 11:26:58 +0200
Subject: [PATCH 03/11] bump chart version

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 charts/quickwit/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/quickwit/Chart.yaml b/charts/quickwit/Chart.yaml
index 27fc1fe..08f7167 100644
--- 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.14
+version: 0.5.15
 appVersion: "v0.8.1"
 keywords:
   - quickwit

From a747e28fdeb0881a7621efc60f54d49c57e5bb29 Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Fri, 3 May 2024 07:59:10 +0200
Subject: [PATCH 04/11] additional labels for Prometheus Rule

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 charts/quickwit/values.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/charts/quickwit/values.yaml b/charts/quickwit/values.yaml
index 1ae55d6..d651c64 100644
--- a/charts/quickwit/values.yaml
+++ b/charts/quickwit/values.yaml
@@ -414,6 +414,8 @@ serviceMonitor:
 # Prometheus Operator alertmanager alerts
 prometheusRule:
   enabled: false
+  # -- Additional labels to add to PrometheusRule resources
+  additionalLabels: {}
   rules: []
   #  - alert: Example
   #    expr: metric == 1

From b6ecd769510a981eb9fcc03fd8e0da4be202603a Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Fri, 3 May 2024 08:00:30 +0200
Subject: [PATCH 05/11] cleanup

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 charts/quickwit/values.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/charts/quickwit/values.yaml b/charts/quickwit/values.yaml
index d651c64..1ae55d6 100644
--- a/charts/quickwit/values.yaml
+++ b/charts/quickwit/values.yaml
@@ -414,8 +414,6 @@ serviceMonitor:
 # Prometheus Operator alertmanager alerts
 prometheusRule:
   enabled: false
-  # -- Additional labels to add to PrometheusRule resources
-  additionalLabels: {}
   rules: []
   #  - alert: Example
   #    expr: metric == 1

From 52e993f531638cdf40a8753ebe3aee7e361c7376 Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Wed, 4 Sep 2024 10:20:18 +0200
Subject: [PATCH 06/11] fix(helm): duplicate labels

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 charts/quickwit/templates/control-plane-deployment.yaml | 1 -
 charts/quickwit/templates/serviceaccount.yaml           | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/charts/quickwit/templates/control-plane-deployment.yaml b/charts/quickwit/templates/control-plane-deployment.yaml
index a2b0fb3..106554a 100644
--- a/charts/quickwit/templates/control-plane-deployment.yaml
+++ b/charts/quickwit/templates/control-plane-deployment.yaml
@@ -33,7 +33,6 @@ spec:
       labels:
         {{- include "quickwit.labels" . | nindent 8 }}
         {{- include "quickwit.control_plane.selectorLabels" . | nindent 8 }}
-        {{- include "quickwit.additionalLabels" . | nindent 8 }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
diff --git a/charts/quickwit/templates/serviceaccount.yaml b/charts/quickwit/templates/serviceaccount.yaml
index 515f7ab..d7e667d 100644
--- a/charts/quickwit/templates/serviceaccount.yaml
+++ b/charts/quickwit/templates/serviceaccount.yaml
@@ -4,7 +4,7 @@ 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:

From 3d0f9b838d42a4ff5dea89ffea1ea4b098088455 Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Wed, 4 Sep 2024 10:26:57 +0200
Subject: [PATCH 07/11] fix(helm): typo

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 charts/quickwit/templates/_helpers.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/quickwit/templates/_helpers.tpl b/charts/quickwit/templates/_helpers.tpl
index 228aae1..b531376 100644
--- a/charts/quickwit/templates/_helpers.tpl
+++ b/charts/quickwit/templates/_helpers.tpl
@@ -200,6 +200,6 @@ Quickwit metastore environment
       name: {{ include "quickwit.fullname" . }}
       key: postgres.password
 - name: QW_METASTORE_URI
-  value: "postgres://$(POSTGRES_USERNAME):$(POSTGRES_PASSWORD)@$(POSTGRES_HOST):$(POSTGRES_PORT)/$(POSTGRES_DATABASE)"      
+  value: "postgres://$(POSTGRES_USERNAME):$(POSTGRES_PASSWORD)@$(POSTGRES_HOST):$(POSTGRES_PORT)/$(POSTGRES_DATABASE)"
 {{- end }}
 {{- end }}

From 06bcd4ff7b3e20c92d8c170fab315d49e72e1576 Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Wed, 4 Sep 2024 10:30:09 +0200
Subject: [PATCH 08/11] feat(helm): refactoring selector

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 charts/quickwit/templates/_helpers.tpl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/charts/quickwit/templates/_helpers.tpl b/charts/quickwit/templates/_helpers.tpl
index b531376..858c604 100644
--- a/charts/quickwit/templates/_helpers.tpl
+++ b/charts/quickwit/templates/_helpers.tpl
@@ -44,7 +44,6 @@ Common labels
 */}}
 {{- define "quickwit.labels" -}}
 helm.sh/chart: {{ include "quickwit.chart" . }}
-{{ include "quickwit.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -65,6 +64,7 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 Searcher Selector labels
 */}}
 {{- define "quickwit.searcher.selectorLabels" -}}
+{{ include "quickwit.selectorLabels" . }}
 app.kubernetes.io/component: searcher
 {{- end }}
 
@@ -72,6 +72,7 @@ app.kubernetes.io/component: searcher
 Janitor Selector labels
 */}}
 {{- define "quickwit.janitor.selectorLabels" -}}
+{{ include "quickwit.selectorLabels" . }}
 app.kubernetes.io/component: janitor
 {{- end }}
 
@@ -79,6 +80,7 @@ app.kubernetes.io/component: janitor
 Metastore Selector labels
 */}}
 {{- define "quickwit.metastore.selectorLabels" -}}
+{{ include "quickwit.selectorLabels" . }}
 app.kubernetes.io/component: metastore
 {{- end }}
 
@@ -86,6 +88,7 @@ app.kubernetes.io/component: metastore
 Control Plane Selector labels
 */}}
 {{- define "quickwit.control_plane.selectorLabels" -}}
+{{ include "quickwit.selectorLabels" . }}
 app.kubernetes.io/component: control-plane
 {{- end }}
 
@@ -93,6 +96,7 @@ app.kubernetes.io/component: control-plane
 Indexer Selector labels
 */}}
 {{- define "quickwit.indexer.selectorLabels" -}}
+{{ include "quickwit.selectorLabels" . }}
 app.kubernetes.io/component: indexer
 {{- end }}
 

From 75d81744886ef3893707ad5cdb0cc936ca1a20b6 Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Wed, 4 Sep 2024 10:33:46 +0200
Subject: [PATCH 09/11] fix(helm): cleanup

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 charts/quickwit/templates/control-plane-deployment.yaml | 1 -
 charts/quickwit/templates/service.yaml                  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/quickwit/templates/control-plane-deployment.yaml b/charts/quickwit/templates/control-plane-deployment.yaml
index 106554a..0b25c44 100644
--- a/charts/quickwit/templates/control-plane-deployment.yaml
+++ b/charts/quickwit/templates/control-plane-deployment.yaml
@@ -16,7 +16,6 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      {{- include "quickwit.selectorLabels" . | nindent 6 }}
       {{- include "quickwit.control_plane.selectorLabels" . | nindent 6 }}
   strategy:
     type: Recreate
diff --git a/charts/quickwit/templates/service.yaml b/charts/quickwit/templates/service.yaml
index 115948f..90b32a9 100644
--- a/charts/quickwit/templates/service.yaml
+++ b/charts/quickwit/templates/service.yaml
@@ -31,6 +31,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}-headless
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.selectorLabels" . | nindent 4 }}
   annotations:
     {{- with .Values.service.annotations }}
     {{- toYaml . | nindent 4 }}

From 20c674ed9e01c05b3094d4a12a6049eb254c04ac Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Wed, 4 Sep 2024 10:36:00 +0200
Subject: [PATCH 10/11] feat(helm): default selector

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 charts/quickwit/templates/configmap-bootstrap.yaml | 1 +
 charts/quickwit/templates/configmap.yaml           | 1 +
 charts/quickwit/templates/secret.yaml              | 1 +
 charts/quickwit/templates/serviceaccount.yaml      | 1 +
 4 files changed, 4 insertions(+)

diff --git a/charts/quickwit/templates/configmap-bootstrap.yaml b/charts/quickwit/templates/configmap-bootstrap.yaml
index 9582f7d..76a180f 100644
--- a/charts/quickwit/templates/configmap-bootstrap.yaml
+++ b/charts/quickwit/templates/configmap-bootstrap.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}-bootstrap
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: config
 data:
   {{- range .Values.config.indexes }}
diff --git a/charts/quickwit/templates/configmap.yaml b/charts/quickwit/templates/configmap.yaml
index 775c52d..071d4db 100644
--- a/charts/quickwit/templates/configmap.yaml
+++ b/charts/quickwit/templates/configmap.yaml
@@ -4,6 +4,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: config
 data:
   node.yaml: |-
diff --git a/charts/quickwit/templates/secret.yaml b/charts/quickwit/templates/secret.yaml
index 61d29ba..7ee2248 100644
--- a/charts/quickwit/templates/secret.yaml
+++ b/charts/quickwit/templates/secret.yaml
@@ -4,6 +4,7 @@ metadata:
   name: {{ include "quickwit.fullname" . }}
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: secret
 type: Opaque
 data:
diff --git a/charts/quickwit/templates/serviceaccount.yaml b/charts/quickwit/templates/serviceaccount.yaml
index d7e667d..518cb6a 100644
--- a/charts/quickwit/templates/serviceaccount.yaml
+++ b/charts/quickwit/templates/serviceaccount.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "quickwit.serviceAccountName" . }}
   labels:
     {{- include "quickwit.labels" . | nindent 4 }}
+    {{- include "quickwit.selectorLabels" . | nindent 4 }}
     app.kubernetes.io/component: rbac
   {{- with .Values.serviceAccount.annotations }}
   annotations:

From d7da1b7a7688c72b385b569f0b5c04ce05f43347 Mon Sep 17 00:00:00 2001
From: Nicolas Lamirault <nicolas.lamirault@gmail.com>
Date: Wed, 4 Sep 2024 10:41:38 +0200
Subject: [PATCH 11/11] fix(helm): remove

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
---
 charts/quickwit/templates/secret.yaml | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 charts/quickwit/templates/secret.yaml

diff --git a/charts/quickwit/templates/secret.yaml b/charts/quickwit/templates/secret.yaml
deleted file mode 100644
index 7ee2248..0000000
--- a/charts/quickwit/templates/secret.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "quickwit.fullname" . }}
-  labels:
-    {{- include "quickwit.labels" . | nindent 4 }}
-    {{- include "quickwit.selectorLabels" . | nindent 4 }}
-    app.kubernetes.io/component: secret
-type: Opaque
-data:
-{{- if .Values.config.postgres }}
-  postgres.password: {{ required "A valid config.postgres.password is required!" .Values.config.postgres.password | b64enc | quote }}
-{{- end }}
-{{- if ((.Values.config.storage).s3).secret_access_key }}
-  storage.s3.secret_access_key: {{ .Values.config.storage.s3.secret_access_key | b64enc | quote }}
-{{- end }}
-{{- if ((.Values.config.storage).azure).access_key }}
-  storage.azure.access_key: {{ .Values.config.storage.azure.access_key | b64enc | quote }}
-{{- end }}