Skip to content

Per-service extraEnv supports arbitrary YAML #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Per-service extraEnv supports arbitrary YAML #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bd1efd
per-service extraEnv supports arbitrary YAML
xrl Sep 25, 2024
5885d51
don't emit an empty environment list
xrl Sep 25, 2024
0a208e5
Merge remote-tracking branch 'upstream/main' into per-service-env-from
xrl Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions charts/quickwit/templates/control-plane-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,8 @@ spec:
{{- end }}
env:
{{- include "quickwit.environment" . | nindent 12 }}
{{- range $key, $value := .Values.control_plane.extraEnv }}
- name: "{{ $key }}"
value: "{{ $value }}"
{{- with .Values.control_plane.extraEnv }}
{{- . | toYaml | nindent 12 }}
{{- end }}
{{- if or (.Values.environmentFrom) (.Values.control_plane.extraEnvFrom) }}
envFrom:
Expand Down
5 changes: 2 additions & 3 deletions charts/quickwit/templates/indexer-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@ spec:
{{- end }}
env:
{{- include "quickwit.environment" . | nindent 12 }}
{{- range $key, $value := .Values.indexer.extraEnv }}
- name: "{{ $key }}"
value: "{{ $value }}"
{{- with .Values.indexer.extraEnv }}
{{- . | toYaml | nindent 12 }}
{{- end }}
{{- if or (.Values.environmentFrom) (.Values.indexer.extraEnvFrom) }}
envFrom:
Expand Down
5 changes: 2 additions & 3 deletions charts/quickwit/templates/janitor-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,8 @@ spec:
{{- end }}
env:
{{- include "quickwit.environment" . | nindent 12 }}
{{- range $key, $value := .Values.janitor.extraEnv }}
- name: "{{ $key }}"
value: "{{ $value }}"
{{- with .Values.janitor.extraEnv }}
{{- . | toYaml | nindent 12 }}
{{- end }}
{{- if or (.Values.environmentFrom) (.Values.janitor.extraEnvFrom) }}
envFrom:
Expand Down
5 changes: 2 additions & 3 deletions charts/quickwit/templates/metastore-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,8 @@ spec:
{{- end }}
env:
{{- include "quickwit.environment" . | nindent 12 }}
{{- range $key, $value := .Values.metastore.extraEnv }}
- name: "{{ $key }}"
value: "{{ $value }}"
{{- with .Values.metastore.extraEnv }}
{{- . | toYaml | nindent 12 }}
{{- end }}
{{- if or (.Values.environmentFrom) (.Values.metastore.extraEnvFrom) }}
envFrom:
Expand Down
5 changes: 2 additions & 3 deletions charts/quickwit/templates/searcher-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,8 @@ spec:
{{- end }}
env:
{{- include "quickwit.environment" . | nindent 12 }}
{{- range $key, $value := .Values.searcher.extraEnv }}
- name: "{{ $key }}"
value: "{{ $value }}"
{{- with .Values.searcher.extraEnv }}
{{- . | toYaml | nindent 12 }}
{{- end }}
{{- if or (.Values.environmentFrom) (.Values.searcher.extraEnvFrom) }}
envFrom:
Expand Down
35 changes: 21 additions & 14 deletions charts/quickwit/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ securityContext:
runAsUser: 1005

# Additional global env
environment: {}
# KEY: VALUE
environment: []
# - name: KEY
# value: VALUE
environmentFrom: []
# - secretRef:
# name: quickwit
Expand All @@ -56,8 +57,9 @@ searcher:
replicaCount: 3

# Extra env for searcher
extraEnv: {}
# KEY: VALUE
extraEnv: []
# - name: KEY
# value: VALUE
extraEnvFrom: []
# - secretRef:
# name: quickwit-searcher
Expand Down Expand Up @@ -147,8 +149,9 @@ indexer:
replicaCount: 1

# Extra env for indexer
extraEnv: {}
# KEY: VALUE
extraEnv: []
# - name: KEY
# value: VALUE
extraEnvFrom: []
# - secretRef:
# name: quickwit-indexer
Expand Down Expand Up @@ -242,8 +245,9 @@ metastore:
replicaCount: 1

# Extra env for metastore
extraEnv: {}
# KEY: VALUE
extraEnv: []
# - name: KEY
# value: VALUE
# This is the recommended way to inject `QW_METASTORE_URI` when using the postgres metastore (see https://quickwit.io/docs/configuration/metastore-config)
extraEnvFrom: []
# - secretRef:
Expand Down Expand Up @@ -309,8 +313,9 @@ metastore:

control_plane:
# Extra env for control plane
extraEnv: {}
# KEY: VALUE
extraEnv: []
# - name: KEY
# value: VALUE
extraEnvFrom: []
# - secretRef:
# name: quickwit-control-plane
Expand Down Expand Up @@ -375,8 +380,9 @@ janitor:
enabled: true

# Extra env for janitor
extraEnv: {}
# KEY: VALUE
extraEnv: []
# - name: KEY
# value: VALUE
extraEnvFrom: []
# - secretRef:
# name: quickwit-janitor
Expand Down Expand Up @@ -442,8 +448,9 @@ bootstrap:
enabled: false

# Extra env for bootstrap jobs
extraEnv: {}
# KEY: VALUE
extraEnv: []
# - name: KEY
# value: VALUE
extraEnvFrom: []
# - secretRef:
# name: quickwit-bootstrap
Expand Down