Skip to content

Commit

Permalink
Adds extraEnv to gitjob and fleet-controller deployments (#2493)
Browse files Browse the repository at this point in the history
This will enable to pass, for example, experimental features to
the upstream fleet pods.

Refers to: #2465

Signed-off-by: Xavi Garcia <xavi.garcia@suse.com>
  • Loading branch information
0xavi0 authored Jun 7, 2024
1 parent 44af8c7 commit 3d7fddb
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
3 changes: 3 additions & 0 deletions charts/fleet/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ spec:
- name: BUNDLEDEPLOYMENT_RECONCILER_WORKERS
value: {{ quote $.Values.controller.reconciler.workers.bundledeployment }}
{{- end }}
{{- if $.Values.extraEnv }}
{{ toYaml $.Values.extraEnv | indent 8}}
{{- end }}
image: '{{ template "system_default_registry" $ }}{{ $.Values.image.repository }}:{{ $.Values.image.tag }}'
name: fleet-controller
imagePullPolicy: "{{ $.Values.image.imagePullPolicy }}"
Expand Down
3 changes: 3 additions & 0 deletions charts/fleet/templates/deployment_gitjob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ spec:
- name: CATTLE_DEV_MODE
value: "true"
{{- end }}
{{- if $.Values.extraEnv }}
{{ toYaml $.Values.extraEnv | indent 12}}
{{- end }}
nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
{{- if .Values.nodeSelector }}
{{ toYaml .Values.nodeSelector | indent 8 }}
Expand Down
7 changes: 6 additions & 1 deletion charts/fleet/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,9 @@ controller:
workers:
gitrepo: "1"
bundle: "1"
bundledeployment: "1"
bundledeployment: "1"

# Extra environment variables passed to the fleet pods.
# extraEnv:
# - name: EXPERIMENTAL_OCI_STORAGE
# value: true

0 comments on commit 3d7fddb

Please sign in to comment.