From 0f2813a0f1a7603ba624a83b1a321c920436904f Mon Sep 17 00:00:00 2001 From: Fred Marques Date: Sat, 5 Oct 2024 17:48:52 +0100 Subject: [PATCH 1/5] Introducing pod lifecycle --- charts/quickwit/templates/indexer-statefulset.yaml | 4 ++++ charts/quickwit/templates/searcher-statefulset.yaml | 4 ++++ charts/quickwit/values.yaml | 10 ++++++++++ 3 files changed, 18 insertions(+) diff --git a/charts/quickwit/templates/indexer-statefulset.yaml b/charts/quickwit/templates/indexer-statefulset.yaml index 52b1e09..64ea0cb 100644 --- a/charts/quickwit/templates/indexer-statefulset.yaml +++ b/charts/quickwit/templates/indexer-statefulset.yaml @@ -128,6 +128,10 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.indexer.lifecycle }} + lifecycle: + {{- toYaml . | nindent 8 }} + {{- end}} {{- if .Values.indexer.persistentVolume.enabled }} volumeClaimTemplates: - metadata: diff --git a/charts/quickwit/templates/searcher-statefulset.yaml b/charts/quickwit/templates/searcher-statefulset.yaml index 0677b33..3eada6e 100644 --- a/charts/quickwit/templates/searcher-statefulset.yaml +++ b/charts/quickwit/templates/searcher-statefulset.yaml @@ -127,6 +127,10 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.indexer.lifecycle }} + lifecycle: + {{- toYaml . | nindent 8 }} + {{- end}} {{- if .Values.searcher.persistentVolume.enabled }} volumeClaimTemplates: - metadata: diff --git a/charts/quickwit/values.yaml b/charts/quickwit/values.yaml index d27b912..dfbf6e1 100644 --- a/charts/quickwit/values.yaml +++ b/charts/quickwit/values.yaml @@ -105,6 +105,8 @@ searcher: path: /health/readyz port: rest + lifecycleHooks: {} + # Override args for starting container args: [] @@ -196,6 +198,14 @@ indexer: affinity: {} + lifecycleHooks: {} + # preStop: + # exec: + # command: + # - /bin/sh + # - -c + # - sleep 30 + # Long grace period is recommended to wait for all index commit_timeout_secs and splits to be published # See https://quickwit.io/docs/configuration/index-config#indexing-settings terminationGracePeriodSeconds: 120 From 1a2ff7ac979a994fb1d3bafc683bf23a9822bf9e Mon Sep 17 00:00:00 2001 From: Fred Marques Date: Sat, 5 Oct 2024 17:52:40 +0100 Subject: [PATCH 2/5] Make values.yaml example the same for searchers --- charts/quickwit/values.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/charts/quickwit/values.yaml b/charts/quickwit/values.yaml index dfbf6e1..dd24e67 100644 --- a/charts/quickwit/values.yaml +++ b/charts/quickwit/values.yaml @@ -106,6 +106,12 @@ searcher: port: rest lifecycleHooks: {} + # preStop: + # exec: + # command: + # - /bin/sh + # - -c + # - sleep 30 # Override args for starting container args: [] From aebb776a0b82622e16df5c7d55b1e718026944c5 Mon Sep 17 00:00:00 2001 From: Fred Marques Date: Sat, 5 Oct 2024 17:58:33 +0100 Subject: [PATCH 3/5] Fix searcher statefulset template --- charts/quickwit/templates/searcher-statefulset.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/quickwit/templates/searcher-statefulset.yaml b/charts/quickwit/templates/searcher-statefulset.yaml index 3eada6e..d9da3d6 100644 --- a/charts/quickwit/templates/searcher-statefulset.yaml +++ b/charts/quickwit/templates/searcher-statefulset.yaml @@ -127,7 +127,7 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.indexer.lifecycle }} + {{- with .Values.searcher.lifecycle }} lifecycle: {{- toYaml . | nindent 8 }} {{- end}} From 30472eebc0f88e6e075dab9d9e2d13f1d32e42fa Mon Sep 17 00:00:00 2001 From: Fred Marques Date: Sat, 5 Oct 2024 18:08:56 +0100 Subject: [PATCH 4/5] Fix path call --- charts/quickwit/templates/indexer-statefulset.yaml | 2 +- charts/quickwit/templates/searcher-statefulset.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/quickwit/templates/indexer-statefulset.yaml b/charts/quickwit/templates/indexer-statefulset.yaml index 64ea0cb..1e3506c 100644 --- a/charts/quickwit/templates/indexer-statefulset.yaml +++ b/charts/quickwit/templates/indexer-statefulset.yaml @@ -128,7 +128,7 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.indexer.lifecycle }} + {{- with .Values.indexer.lifecycleHooks }} lifecycle: {{- toYaml . | nindent 8 }} {{- end}} diff --git a/charts/quickwit/templates/searcher-statefulset.yaml b/charts/quickwit/templates/searcher-statefulset.yaml index d9da3d6..e074d0c 100644 --- a/charts/quickwit/templates/searcher-statefulset.yaml +++ b/charts/quickwit/templates/searcher-statefulset.yaml @@ -127,7 +127,7 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} - {{- with .Values.searcher.lifecycle }} + {{- with .Values.searcher.lifecycleHooks }} lifecycle: {{- toYaml . | nindent 8 }} {{- end}} From fe54df2c84723747a5973a4f967e685105129a59 Mon Sep 17 00:00:00 2001 From: Fred Marques Date: Mon, 14 Oct 2024 18:08:45 +0100 Subject: [PATCH 5/5] Bump chart version --- 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 729f8b5..6871717 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.7.1 +version: 0.7.2 appVersion: "v0.8.2" keywords: - quickwit