Skip to content

Commit 7d9cbc5

Browse files
authored
Merge pull request #16 from quickwit-oss/fmassot--fix-test-ci
Make postgres optional, useful mainly for testing.
2 parents 89f5c86 + 1d2b945 commit 7d9cbc5

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

charts/quickwit/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: quickwit
33
description: Open-Source & Cloud-Native Log Management at any scale.
44
type: application
5-
version: 0.1.9
5+
version: 0.1.10
66
appVersion: "edge"
77
keywords:
88
- quickwit

charts/quickwit/templates/_helpers.tpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ Quickwit metastore environment
170170
*/}}
171171
{{- define "quickwit.metastore.environment" -}}
172172
{{ include "quickwit.environment" . }}
173+
{{- if .Values.config.postgres }}
173174
- name: POSTGRES_HOST
174175
value: {{ required "A valid config.postgres.host is required!" .Values.config.postgres.host }}
175176
- name: POSTGRES_PORT
@@ -186,4 +187,5 @@ Quickwit metastore environment
186187
- name: QW_METASTORE_URI
187188
value: "postgres://$(POSTGRES_USERNAME):$(POSTGRES_PASSWORD)@$(POSTGRES_HOST):$(POSTGRES_PORT)/$(POSTGRES_DATABASE)"
188189
{{- end }}
190+
{{- end }}
189191

charts/quickwit/templates/secret.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ metadata:
66
{{- include "quickwit.labels" . | nindent 4 }}
77
type: Opaque
88
data:
9+
{{- if .Values.postgres }}
910
postgres.password: {{ required "A valid config.postgres.password is required!" .Values.config.postgres.password | b64enc | quote }}
11+
{{- end }}
1012
{{- if .Values.config.s3.secret_key }}
1113
s3.secret_key: {{ .Values.config.s3.secret_key | b64enc | quote }}
1214
{{- end }}

charts/quickwit/values.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -256,12 +256,13 @@ bootstrap:
256256

257257
# Quickwit configuration
258258
config:
259-
postgres:
260-
host: ""
261-
port: 5432
262-
database: metastore
263-
username: quickwit
264-
password: ""
259+
# Metastore configuration.
260+
postgres: {}
261+
# host: ""
262+
# port: 5432
263+
# database: metastore
264+
# username: quickwit
265+
# password: ""
265266

266267
s3: {}
267268
# endpoint: "https://s3.eu-west-1.amazonaws.com"

0 commit comments

Comments
 (0)