From 4f9524c8b743ce71a4e239e55e4569a3645c4ce0 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 8 Apr 2021 16:19:51 +0200 Subject: [PATCH] feat: add support for volumeAttributes to aws-efs-csi-driver to allow to disable buggy TLS encryption --- charts/kubezero-aws-efs-csi-driver/Chart.yaml | 2 +- .../templates/efs_pv.yaml | 21 ------------------- .../templates/efs_pvs.yaml | 8 +++---- .../kubezero-aws-efs-csi-driver/values.yaml | 6 ------ 4 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 charts/kubezero-aws-efs-csi-driver/templates/efs_pv.yaml diff --git a/charts/kubezero-aws-efs-csi-driver/Chart.yaml b/charts/kubezero-aws-efs-csi-driver/Chart.yaml index 52816cab..8bd4a5da 100644 --- a/charts/kubezero-aws-efs-csi-driver/Chart.yaml +++ b/charts/kubezero-aws-efs-csi-driver/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: kubezero-aws-efs-csi-driver description: KubeZero Umbrella Chart for aws-efs-csi-driver -version: 0.3.4 +version: 0.3.5 appVersion: 1.2.0 kubeVersion: ">=1.18.0-0" home: https://kubezero.com diff --git a/charts/kubezero-aws-efs-csi-driver/templates/efs_pv.yaml b/charts/kubezero-aws-efs-csi-driver/templates/efs_pv.yaml deleted file mode 100644 index 3180d4a1..00000000 --- a/charts/kubezero-aws-efs-csi-driver/templates/efs_pv.yaml +++ /dev/null @@ -1,21 +0,0 @@ -{{- if .Values.PersistentVolume }} -{{- if .Values.PersistentVolume.create }} -apiVersion: v1 -kind: PersistentVolume -metadata: - name: {{ default "kubezero-efs-pv" .Values.PersistentVolume.Name }} - labels: -{{ include "kubezero-lib.labels" . | indent 4 }} -spec: - capacity: - storage: 5Gi - volumeMode: Filesystem - accessModes: - - ReadWriteMany - persistentVolumeReclaimPolicy: Retain - storageClassName: efs-sc - csi: - driver: efs.csi.aws.com - volumeHandle: {{ .Values.PersistentVolume.EfsId }} -{{- end }} -{{- end }} diff --git a/charts/kubezero-aws-efs-csi-driver/templates/efs_pvs.yaml b/charts/kubezero-aws-efs-csi-driver/templates/efs_pvs.yaml index f7a6e88f..39435189 100644 --- a/charts/kubezero-aws-efs-csi-driver/templates/efs_pvs.yaml +++ b/charts/kubezero-aws-efs-csi-driver/templates/efs_pvs.yaml @@ -16,10 +16,10 @@ spec: csi: driver: efs.csi.aws.com volumeHandle: {{ .volumeHandle }} - {{- with .mountOptions }} - mountOptions: - {{- . | toYaml | nindent 4 }} - {{- end }} + {{- with .volumeAttributes }} + volumeAttributes: + {{- . | toYaml | nindent 6 }} + {{- end }} {{- with .claimRef }} claimRef: {{- . | toYaml | nindent 4 }} diff --git a/charts/kubezero-aws-efs-csi-driver/values.yaml b/charts/kubezero-aws-efs-csi-driver/values.yaml index 32342bfb..5ad60883 100644 --- a/charts/kubezero-aws-efs-csi-driver/values.yaml +++ b/charts/kubezero-aws-efs-csi-driver/values.yaml @@ -31,9 +31,3 @@ StorageClass: # # - name: example-pv2 # volumeHandle: ":/path2" - -# Deprecated and removed with next release -# PersistentVolume: -# create: false -# EfsId: "" -# Name: ""