Set default cluster ID via env var only if not set in node config (#147)

Author: guilload

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.19
+version: 0.7.20
 appVersion: v0.8.2
 keywords:
   - quickwit

charts/quickwit/templates/_helpers.tpl

@@ -145,8 +145,10 @@ Quickwit environment
       fieldPath: status.podIP
 - name: QW_CONFIG
   value: {{ .Values.configLocation }}
+{{- if not .Values.config.cluster_id }}
 - name: QW_CLUSTER_ID
   value: {{ .Release.Namespace }}-{{ include "quickwit.fullname" . }}
+{{- end }}
 - name: QW_NODE_ID
   value: "$(POD_NAME)"
 - name: QW_PEER_SEEDS

charts/quickwit/values.yaml

@@ -510,14 +510,16 @@ bootstrap:
     # extraVolumeMounts -- Additional volumes to mount into bootstrap containers (not the init containers).
     extraVolumeMounts: []
 
-# Quickwit configuration
+# Node configuration
 # Warning: This config is writed directly into a configMap
 # to avoid passing sensitive value you can pass environment variables.
 # https://quickwit.io/docs/configuration/node-config#using-environment-variables-in-the-configuration
 configLocation: /quickwit/node.yaml
 
 config:
   version: 0.8
+  # Override the cluster ID generated by the chart here.
+  # cluster_id: my-cluster
   listen_address: 0.0.0.0
   gossip_listen_port: 7282
   data_dir: /quickwit/qwdata