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

AWS EBS CSI Driver Helm chart to inject environment variables #817

Merged
merged 3 commits into from
Mar 29, 2021
Merged

AWS EBS CSI Driver Helm chart to inject environment variables #817

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
0fdab20
Add the possibility of passing additional env vars
tomdymond Mar 26, 2021
a81d1d8
Additonal environment variables for the controller
tomdymond Mar 26, 2021
5924f16
Update patch version
tomdymond Mar 29, 2021
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
2 changes: 1 addition & 1 deletion charts/aws-ebs-csi-driver/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
appVersion: "0.9.1"
name: aws-ebs-csi-driver
description: A Helm chart for AWS EBS CSI Driver
version: 0.9.14
version: 0.9.15
kubeVersion: ">=1.17.0-0"
home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver
sources:
Expand Down
6 changes: 6 additions & 0 deletions charts/aws-ebs-csi-driver/templates/controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ spec:
- name: AWS_REGION
value: {{ .Values.region }}
{{- end }}
{{- if .Values.controller.extraVars }}
{{- range $key, $val := .Values.controller.extraVars }}
- name: {{ $key }}
value: "{{ $val }}"
{{- end }}
{{- end }}
{{- if .Values.proxy.http_proxy }}
- name: HTTP_PROXY
value: {{ .Values.proxy.http_proxy | quote }}
Expand Down
4 changes: 4 additions & 0 deletions charts/aws-ebs-csi-driver/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@ k8sTagClusterId: ""
# region: us-east-1
region: ""

# Additonal environment variables for the controller
controller:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this is fine as @krmichel will do this regardless.

Can you update the chart version though (just the patch field)? Otherwise releaser fails.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for checking. I've done this now

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mine will be slightly different as I have added the ability to set env vars for each of the containers in the controller pod.
krmichel@e0261ec#diff-cd438cefb202fb6fb653f659771ea635aa04dd99bb6d0902a0ab8eabebcf0a1eR68

extraVars: {}

node:
priorityClassName: ""
nodeSelector: {}
Expand Down