Skip to content

Commit

Permalink
fix(task-processor): the extraEnv where added in the wrong place (#220)
Browse files Browse the repository at this point in the history
The environment variables added for the task processor should go inside
the container that runs the task processor rather in the deployment
template spec.

The task processor was already including the api environment so it was
not necessary to add merge both `extraEnv`

Also the `extraEnv` keys and values were added as yaml, instead of the
expected object with the `name` and `value` keys.
  • Loading branch information
blackjid authored May 21, 2024
1 parent 5634e26 commit 19b8cb6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion charts/flagsmith/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: flagsmith
description: Flagsmith
type: application
version: 0.40.0
version: 0.40.1
appVersion: 2.115.0
dependencies:
- name: postgresql
Expand Down
4 changes: 4 additions & 0 deletions charts/flagsmith/templates/_task_processor_environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@
- name: TASK_PROCESSOR_QUEUE_POP_SIZE
value: {{ .Values.taskProcessor.queuePopSize | quote }}
{{- end }}
{{- range $envName, $envValue := .Values.taskProcessor.extraEnv }}
- name: {{ $envName }}
value: {{ $envValue | quote }}
{{- end }}
3 changes: 0 additions & 3 deletions charts/flagsmith/templates/deployment-task-processor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ spec:
{{- $securityContext = $securityContext | merge (omit .Values.taskProcessor.defaultPodSecurityContext "enabled") }}
{{- end }}
{{- toYaml $securityContext | nindent 8 }}
env:
{{- $mergedEnv := merge .Values.api.extraEnv .Values.taskProcessor.extraEnv }}
{{- toYaml $mergedEnv | nindent 8 }}
{{- with .Values.taskProcessor.extraInitContainers }}
initContainers:
{{- toYaml . | nindent 6 }}
Expand Down

0 comments on commit 19b8cb6

Please sign in to comment.