Skip to content
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

Add extraContainers #51

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

Add extraContainers #51

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
14702c3
feat: allow extra containers
EternalDeiwos Dec 20, 2024
2acb26b
fix: add template for extra containers
EternalDeiwos Dec 20, 2024
e348661
fix: correct template invocation
EternalDeiwos Dec 20, 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
10 changes: 10 additions & 0 deletions charts/dremio_v2/templates/_helpers_coordinator.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,16 @@ Coordinator - Pod Extra Volume Mounts
{{- end -}}
{{- end -}}

{{/*
Coordinator - Pod Extra Containers
*/}}
{{- define "dremio.coordinator.extraContainers" -}}
{{- $coordinatorExtraContainers := default (default (dict) $.Values.extraContainers) $.Values.coordinator.extraContainers -}}
{{- if $coordinatorExtraContainers -}}
{{ toYaml $coordinatorExtraContainers }}
{{- end -}}
{{- end -}}

{{/*
Coordinator - Pod Extra Volumes
*/}}
Expand Down
13 changes: 13 additions & 0 deletions charts/dremio_v2/templates/_helpers_executor.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,19 @@ Executor - Pod Extra Volume Mounts
{{- end -}}
{{- end -}}

{{/*
Executor - Pod Extra Containers
*/}}
{{- define "dremio.executor.extraContainers" -}}
{{- $context := index . 0 -}}
{{- $engineName := index . 1 -}}
{{- $engineConfiguration := default (dict) (get (default (dict) $context.Values.executor.engineOverride) $engineName) -}}
{{- $engineExtraContainers := coalesce $engineConfiguration.extraContainers $context.Values.executor.extraContainers $context.Values.extraContainers -}}
{{- if $engineExtraContainers -}}
{{ toYaml $engineExtraContainers }}
{{- end -}}
{{- end -}}

{{/*
Executor - Pod Extra Volume Mounts
*/}}
Expand Down
1 change: 1 addition & 0 deletions charts/dremio_v2/templates/dremio-coordinator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ spec:
{{- include "dremio.coordinator.tolerations" $ | nindent 6 }}
{{- include "dremio.podSecurityContext" $ | nindent 6 }}
containers:
{{- include "dremio.coordinator.extraContainers" $ | nindent 6 }}
- name: dremio-coordinator
{{- include "dremio.containerSecurityContext" $ | nindent 8 }}
image: {{ $.Values.image }}:{{ $.Values.imageTag }}
Expand Down
1 change: 1 addition & 0 deletions charts/dremio_v2/templates/dremio-executor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ spec:
{{- include "dremio.executor.tolerations" (list $ $engineName) | nindent 6}}
{{- include "dremio.podSecurityContext" $ | nindent 6 }}
containers:
{{- include "dremio.executor.extraContainers" (list $ $engineName) | nindent 6 }}
- name: dremio-executor
{{- include "dremio.containerSecurityContext" $ | nindent 8 }}
image: {{ $.Values.image }}:{{ $.Values.imageTag }}
Expand Down
1 change: 1 addition & 0 deletions charts/dremio_v2/templates/dremio-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ spec:
{{- include "dremio.coordinator.tolerations" $ | nindent 6 }}
{{- include "dremio.podSecurityContext" $ | nindent 6 }}
containers:
{{- include "dremio.coordinator.extraContainers" $ | nindent 6 }}
- name: dremio-master-coordinator
{{- include "dremio.containerSecurityContext" $ | nindent 8 }}
image: {{ $.Values.image }}:{{ $.Values.imageTag }}
Expand Down
13 changes: 13 additions & 0 deletions charts/dremio_v2/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ coordinator:
# Uncomment below to use a custom set of extra volume mounts for the coordinator.
#extraVolumeMounts: []

# Extra Containers
# Uncomment below to use a custom set of extra containers for the coordinator.
#extraContainers: []

# Extra Environment Variables
# Uncomment below to add extra environment variables for the coordinator.
#extraEnvs: []
Expand Down Expand Up @@ -193,6 +197,10 @@ executor:
# Uncomment below to use a custom set of extra volume mounts for executors.
#extraVolumeMounts: []

# Extra Containers
# Uncomment below to use a custom set of extra containers for the coordinator.
#extraContainers: []

# Extra Environment Variables
# Uncomment below to add extra environment variables for the executors.
#extraEnvs: []
Expand Down Expand Up @@ -306,6 +314,7 @@ executor:
#
# extraVolumes: []
# extraVolumeMounts: []
# extraContainers: []
# extraEnvs: []
#
# volumeSize: 50Gi
Expand Down Expand Up @@ -513,6 +522,10 @@ extraVolumes: []
# Array to add extra volume mounts to all Dremio resources, normally used in conjunction wtih extraVolumes.
extraVolumeMounts: []

# Extra Containers
# Uncomment below to use a custom set of extra containers for the coordinator.
extraContainers: []

# Extra Environment Variables
# Array to add extra environment variables to Dremio's pods
extraEnvs: []
Expand Down