diff --git a/charts/dremio_v2/templates/_helpers_coordinator.tpl b/charts/dremio_v2/templates/_helpers_coordinator.tpl index 1d4d868..7e283f3 100644 --- a/charts/dremio_v2/templates/_helpers_coordinator.tpl +++ b/charts/dremio_v2/templates/_helpers_coordinator.tpl @@ -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 */}} diff --git a/charts/dremio_v2/templates/_helpers_executor.tpl b/charts/dremio_v2/templates/_helpers_executor.tpl index 3b78aeb..56712cd 100644 --- a/charts/dremio_v2/templates/_helpers_executor.tpl +++ b/charts/dremio_v2/templates/_helpers_executor.tpl @@ -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 */}} diff --git a/charts/dremio_v2/templates/dremio-coordinator.yaml b/charts/dremio_v2/templates/dremio-coordinator.yaml index eeb3e0e..15f72bf 100644 --- a/charts/dremio_v2/templates/dremio-coordinator.yaml +++ b/charts/dremio_v2/templates/dremio-coordinator.yaml @@ -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 }} diff --git a/charts/dremio_v2/templates/dremio-executor.yaml b/charts/dremio_v2/templates/dremio-executor.yaml index ee44066..67ad2c9 100644 --- a/charts/dremio_v2/templates/dremio-executor.yaml +++ b/charts/dremio_v2/templates/dremio-executor.yaml @@ -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 }} diff --git a/charts/dremio_v2/templates/dremio-master.yaml b/charts/dremio_v2/templates/dremio-master.yaml index e25d85b..13468f6 100644 --- a/charts/dremio_v2/templates/dremio-master.yaml +++ b/charts/dremio_v2/templates/dremio-master.yaml @@ -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 }} diff --git a/charts/dremio_v2/values.yaml b/charts/dremio_v2/values.yaml index 5f6ee70..abf9351 100644 --- a/charts/dremio_v2/values.yaml +++ b/charts/dremio_v2/values.yaml @@ -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: [] @@ -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: [] @@ -306,6 +314,7 @@ executor: # # extraVolumes: [] # extraVolumeMounts: [] + # extraContainers: [] # extraEnvs: [] # # volumeSize: 50Gi @@ -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: []