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.

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

in helm chart add proxy settings as secret #1499

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions charts/aws-efs-csi-driver/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Helm chart
# v3.1.2
* add proxy settings as secret
# v3.1.1
* Bump app/driver version to `v2.1.0`
# v3.1.0
Expand Down
2 changes: 1 addition & 1 deletion charts/aws-efs-csi-driver/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: aws-efs-csi-driver
version: 3.1.1
version: 3.1.2
appVersion: 2.1.0
kubeVersion: ">=1.17.0-0"
description: "A Helm chart for AWS EFS CSI Driver"
Expand Down
17 changes: 17 additions & 0 deletions charts/aws-efs-csi-driver/templates/controller-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,23 @@ spec:
- name: AWS_USE_FIPS_ENDPOINT
value: "true"
{{- end }}
{{- if .Values.controller.httpProxy }}
- name: HTTP_PROXY
valueFrom:
secretKeyRef:
name: efs-csi-controller-proxy
key: httpProxy
- name: HTTPS_PROXY
valueFrom:
secretKeyRef:
name: efs-csi-controller-proxy
key: httpsProxy
- name: NO_PROXY
valueFrom:
secretKeyRef:
name: efs-csi-controller-proxy
key: noProxy
{{- end }}
{{- with .Values.controller.env }}
{{- toYaml . | nindent 12 }}
{{- end }}
Expand Down
11 changes: 11 additions & 0 deletions charts/aws-efs-csi-driver/templates/controller-secret-proxy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{{- if .Values.controller.httpProxy }}
apiVersion: v1
kind: Secret
type: Opaque
metadata:
name: efs-csi-controller-proxy
data:
httpProxy: "{{ .Values.controller.httpProxy | b64enc }}"
httpsProxy: "{{ .Values.controller.httpsProxy | default .Values.controller.httpProxy | b64enc }}"
noProxy: "{{ printf "%s,.%s.svc,.%s.svc.cluster.local" .Values.controller.noProxy .Release.Namespace .Release.Namespace | b64enc }}"
{{- end }}
3 changes: 3 additions & 0 deletions charts/aws-efs-csi-driver/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ controller:
operator: Exists
affinity: {}
env: []
httpProxy: ""
httpsProxy: ""
noProxy: "localhost,127.0.0.1"
volumes: []
volumeMounts: []
# Specifies whether a service account should be created
Expand Down