Merge pull request #99 from quickwit-oss/feat-merge-jobs-bootstrap-se…

…ction Feat issue #98: merging jobs and bootstrap section
quickwit-oss · Aug 1, 2024 · 44056e3 · 44056e3
2 parents ba1d203 + 1e82864
commit 44056e3
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -51,3 +51,10 @@ more details).
   changes are:
   - the `config.indexes` field is moved to `seed.indexes`
   - the `config.sources` field is moved to `seed.sources`
+
+## Upgrade helm chart from 0.6.0 to 0.7.0
+
+The `jobs` and `bootstrap` sections got merged in 0.7.0:
+
+* `jobs.sources` section is now replaced by `bootstrap.sources`
+* `jobs.indexes` section is now replaced by `bootstrap.indexes`
diff --git a/charts/quickwit/Chart.yaml b/charts/quickwit/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: quickwit
 description: Sub-second search & analytics engine on cloud storage.
 type: application
-version: 0.6.5
-appVersion: "v0.8.1"
+version: 0.7.0
+appVersion: "v0.8.2"
 keywords:
   - quickwit
   - search

diff --git a/charts/quickwit/templates/job-create-indices.yaml b/charts/quickwit/templates/job-create-indices.yaml
@@ -28,7 +28,7 @@ spec:
       securityContext:
         {{- toYaml $.Values.podSecurityContext | nindent 8 }}
       restartPolicy: Never
-      {{- with $.Values.jobs.indexes.initContainers }}
+      {{- with $.Values.bootstrap.indexes.initContainers }}
       initContainers:
         {{- toYaml . | nindent 8 }}
       {{ end }}
@@ -38,8 +38,8 @@ spec:
           {{- toYaml $.Values.securityContext | nindent 10 }}
         image: "{{ $.Values.image.repository }}:{{ $.Values.image.tag | default $.Chart.AppVersion }}"
         imagePullPolicy: {{ $.Values.image.pullPolicy }}
-        {{- if $.Values.jobs.indexes.command }}
-        command: {{- toYaml $.Values.jobs.sources.command | nindent 8 }}
+        {{- if $.Values.bootstrap.indexes.command }}
+        command: {{- toYaml $.Values.bootstrap.sources.command | nindent 8 }}
         {{- else }}
         command: ["/bin/bash","-c","quickwit index describe --index {{ .index_id }} --endpoint ${QW_CLUSTER_ENDPOINT} || quickwit index create --index-config {{ .index_id }}.yaml --endpoint ${QW_CLUSTER_ENDPOINT}"]
         {{- end }}
@@ -65,7 +65,7 @@ spec:
           - name: index
             mountPath: /quickwit/{{ .index_id }}.yaml
             subPath: {{ .index_id }}.yaml
-          {{- with $.Values.jobs.indexes.extraVolumeMounts }}
+          {{- with $.Values.bootstrap.indexes.extraVolumeMounts }}
             {{- toYaml . | nindent 10 }}
           {{- end }}
         resources:
@@ -83,7 +83,7 @@ spec:
             items:
               - key: {{ .index_id }}.yaml
                 path: {{ .index_id }}.yaml
-         {{- with $.Values.jobs.indexes.extraVolumes }}
+         {{- with $.Values.bootstrap.indexes.extraVolumes }}
            {{- toYaml . | nindent 8 }}
          {{- end }}
       {{- with $.Values.bootstrap.nodeSelector }}

diff --git a/charts/quickwit/templates/job-create-sources.yaml b/charts/quickwit/templates/job-create-sources.yaml
@@ -28,7 +28,7 @@ spec:
       securityContext:
         {{- toYaml $.Values.podSecurityContext | nindent 8 }}
       restartPolicy: Never
-      {{- with $.Values.jobs.sources.initContainers }}
+      {{- with $.Values.bootstrap.sources.initContainers }}
       initContainers:
         {{- toYaml . | nindent 8 }}
       {{ end }}
@@ -38,8 +38,8 @@ spec:
           {{- toYaml $.Values.securityContext | nindent 10 }}
         image: "{{ $.Values.image.repository }}:{{ $.Values.image.tag | default $.Chart.AppVersion }}"
         imagePullPolicy: {{ $.Values.image.pullPolicy }}
-      {{- if $.Values.jobs.sources.command }}
-        command: {{- toYaml $.Values.jobs.sources.command | nindent 8 }}
+      {{- if $.Values.bootstrap.sources.command }}
+        command: {{- toYaml $.Values.bootstrap.sources.command | nindent 8 }}
       {{- else }}
         command: ["/bin/bash","-c","quickwit source describe --index {{ .index }} --source {{ .source.source_id }} --endpoint ${QW_CLUSTER_ENDPOINT} || quickwit source create --index {{ .index }} --source-config {{ .source.source_id }}.yaml --endpoint ${QW_CLUSTER_ENDPOINT}"]
       {{- end }}
@@ -67,7 +67,7 @@ spec:
             mountPath: /quickwit/{{ .source.source_id }}.yaml
             subPath: {{ .source.source_id }}.yaml
           {{- end }}
-          {{- with $.Values.jobs.sources.extraVolumeMounts }}
+          {{- with $.Values.bootstrap.sources.extraVolumeMounts }}
             {{- toYaml . | nindent 10 }}
           {{- end }}
         resources:
@@ -85,7 +85,7 @@ spec:
             items:
               - key: {{ .source.source_id }}.yaml
                 path: {{ .source.source_id }}.yaml
-         {{- with $.Values.jobs.sources.extraVolumes }}
+         {{- with $.Values.bootstrap.sources.extraVolumes }}
            {{- toYaml . | nindent 8 }}
          {{- end }}
       {{- with $.Values.bootstrap.nodeSelector }}

diff --git a/charts/quickwit/values.yaml b/charts/quickwit/values.yaml
@@ -421,7 +421,6 @@ bootstrap:
 
   affinity: {}
 
-jobs:
   sources:
     # Override command for starting container
     command: []