From 21a9816dea0b12c0dcf17eec23be824593eaf871 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Wed, 21 Oct 2020 04:37:33 -0700 Subject: [PATCH] More EFS fixes, cert-manager version bump --- charts/kubezero-aws-efs-csi-driver/templates/efs_pv.yaml | 2 ++ charts/kubezero-aws-efs-csi-driver/values.yaml | 8 ++++---- charts/kubezero-cert-manager/Chart.yaml | 4 ++-- deploy/templates/values.yaml | 6 +++++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/charts/kubezero-aws-efs-csi-driver/templates/efs_pv.yaml b/charts/kubezero-aws-efs-csi-driver/templates/efs_pv.yaml index ed56adf..3180d4a 100644 --- a/charts/kubezero-aws-efs-csi-driver/templates/efs_pv.yaml +++ b/charts/kubezero-aws-efs-csi-driver/templates/efs_pv.yaml @@ -1,3 +1,4 @@ +{{- if .Values.PersistentVolume }} {{- if .Values.PersistentVolume.create }} apiVersion: v1 kind: PersistentVolume @@ -17,3 +18,4 @@ spec: driver: efs.csi.aws.com volumeHandle: {{ .Values.PersistentVolume.EfsId }} {{- end }} +{{- end }} diff --git a/charts/kubezero-aws-efs-csi-driver/values.yaml b/charts/kubezero-aws-efs-csi-driver/values.yaml index 8650a11..e02877c 100644 --- a/charts/kubezero-aws-efs-csi-driver/values.yaml +++ b/charts/kubezero-aws-efs-csi-driver/values.yaml @@ -19,7 +19,7 @@ StorageClass: # volumeHandle: ":/path2" # Deprecated and removed with next release -PersistentVolume: - create: false - EfsId: "" - Name: "" +# PersistentVolume: +# create: false +# EfsId: "" +# Name: "" diff --git a/charts/kubezero-cert-manager/Chart.yaml b/charts/kubezero-cert-manager/Chart.yaml index 8a15bf2..9096c45 100644 --- a/charts/kubezero-cert-manager/Chart.yaml +++ b/charts/kubezero-cert-manager/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-cert-manager description: KubeZero Umbrella Chart for cert-manager type: application -version: 0.3.6 +version: 0.4.0 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png keywords: @@ -15,6 +15,6 @@ dependencies: version: ">= 0.1.3" repository: https://zero-down-time.github.io/kubezero/ - name: cert-manager - version: 0.15.1 + version: 1.0.3 repository: https://charts.jetstack.io kubeVersion: ">= 1.16.0" diff --git a/deploy/templates/values.yaml b/deploy/templates/values.yaml index 00cd590..0e5698b 100644 --- a/deploy/templates/values.yaml +++ b/deploy/templates/values.yaml @@ -78,17 +78,21 @@ kubezero: aws-efs-csi-driver: enabled: {{ index .Values "aws-efs-csi-driver" "enabled" }} values: + {{- with index .Values "aws-efs-csi-driver" "nodeSelector" }} aws-efs-csi-driver: nodeSelector: - node.kubernetes.io/csi.efs.fs: {{ index .Values "aws-efs-csi-driver" "EfsId" }} + {{- toYaml . | nindent 10 }} + {{- end }} {{- with index .Values "aws-efs-csi-driver" "PersistentVolumes" }} PersistentVolumes: {{- toYaml . | nindent 8 }} {{- end }} + {{- if index .Values "aws-efs-csi-driver" "PersistentVolume" }} PersistentVolume: create: true EfsId: {{ index .Values "aws-efs-csi-driver" "EfsId" }} Name: {{ default "kubezero-efs-pv" ( index .Values "aws-efs-csi-driver" "PVName" ) }} + {{- end }} {{- end }} istio: