From 05f7cc3af24496b040e343b0ed7972b862e6c0fa Mon Sep 17 00:00:00 2001 From: "Hanzlik, Robert (MONETA)" Date: Fri, 8 Nov 2024 08:44:23 +0000 Subject: [PATCH 1/2] add proxy settings as secret Signed-off-by: Hanzlik, Robert (MONETA) --- charts/aws-efs-csi-driver/CHANGELOG.md | 2 ++ .../templates/controller-deployment.yaml | 17 +++++++++++++++++ .../templates/controller-secret-proxy.yaml | 11 +++++++++++ charts/aws-efs-csi-driver/values.yaml | 3 +++ 4 files changed, 33 insertions(+) create mode 100644 charts/aws-efs-csi-driver/templates/controller-secret-proxy.yaml diff --git a/charts/aws-efs-csi-driver/CHANGELOG.md b/charts/aws-efs-csi-driver/CHANGELOG.md index 65178430b..4fdf1ad4a 100644 --- a/charts/aws-efs-csi-driver/CHANGELOG.md +++ b/charts/aws-efs-csi-driver/CHANGELOG.md @@ -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 diff --git a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml index 39b60d31f..a4b2e281b 100644 --- a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml +++ b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml @@ -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 }} diff --git a/charts/aws-efs-csi-driver/templates/controller-secret-proxy.yaml b/charts/aws-efs-csi-driver/templates/controller-secret-proxy.yaml new file mode 100644 index 000000000..c576bdc4a --- /dev/null +++ b/charts/aws-efs-csi-driver/templates/controller-secret-proxy.yaml @@ -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 }} \ No newline at end of file diff --git a/charts/aws-efs-csi-driver/values.yaml b/charts/aws-efs-csi-driver/values.yaml index 5637ca7c0..8abcf7030 100644 --- a/charts/aws-efs-csi-driver/values.yaml +++ b/charts/aws-efs-csi-driver/values.yaml @@ -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 From f2f56219f5f38c65711849971f429ee10511b894 Mon Sep 17 00:00:00 2001 From: "Hanzlik, Robert (MONETA)" Date: Fri, 8 Nov 2024 08:58:20 +0000 Subject: [PATCH 2/2] increase Chart version Signed-off-by: Hanzlik, Robert (MONETA) --- charts/aws-efs-csi-driver/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/aws-efs-csi-driver/Chart.yaml b/charts/aws-efs-csi-driver/Chart.yaml index 2aaf4fb81..c2341925c 100644 --- a/charts/aws-efs-csi-driver/Chart.yaml +++ b/charts/aws-efs-csi-driver/Chart.yaml @@ -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"