More EFS fixes, cert-manager version bump
This commit is contained in:
parent
19d915cb92
commit
44d08c7abc
@ -1,3 +1,4 @@
|
|||||||
|
{{- if .Values.PersistentVolume }}
|
||||||
{{- if .Values.PersistentVolume.create }}
|
{{- if .Values.PersistentVolume.create }}
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: PersistentVolume
|
kind: PersistentVolume
|
||||||
@ -17,3 +18,4 @@ spec:
|
|||||||
driver: efs.csi.aws.com
|
driver: efs.csi.aws.com
|
||||||
volumeHandle: {{ .Values.PersistentVolume.EfsId }}
|
volumeHandle: {{ .Values.PersistentVolume.EfsId }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
@ -19,7 +19,7 @@ StorageClass:
|
|||||||
# volumeHandle: "<efs-id>:/path2"
|
# volumeHandle: "<efs-id>:/path2"
|
||||||
|
|
||||||
# Deprecated and removed with next release
|
# Deprecated and removed with next release
|
||||||
PersistentVolume:
|
# PersistentVolume:
|
||||||
create: false
|
# create: false
|
||||||
EfsId: ""
|
# EfsId: ""
|
||||||
Name: ""
|
# Name: ""
|
||||||
|
@ -2,7 +2,7 @@ apiVersion: v2
|
|||||||
name: kubezero-cert-manager
|
name: kubezero-cert-manager
|
||||||
description: KubeZero Umbrella Chart for cert-manager
|
description: KubeZero Umbrella Chart for cert-manager
|
||||||
type: application
|
type: application
|
||||||
version: 0.3.6
|
version: 0.4.0
|
||||||
home: https://kubezero.com
|
home: https://kubezero.com
|
||||||
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
|
icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
|
||||||
keywords:
|
keywords:
|
||||||
@ -15,6 +15,6 @@ dependencies:
|
|||||||
version: ">= 0.1.3"
|
version: ">= 0.1.3"
|
||||||
repository: https://zero-down-time.github.io/kubezero/
|
repository: https://zero-down-time.github.io/kubezero/
|
||||||
- name: cert-manager
|
- name: cert-manager
|
||||||
version: 0.15.1
|
version: 1.0.3
|
||||||
repository: https://charts.jetstack.io
|
repository: https://charts.jetstack.io
|
||||||
kubeVersion: ">= 1.16.0"
|
kubeVersion: ">= 1.16.0"
|
||||||
|
@ -78,17 +78,21 @@ kubezero:
|
|||||||
aws-efs-csi-driver:
|
aws-efs-csi-driver:
|
||||||
enabled: {{ index .Values "aws-efs-csi-driver" "enabled" }}
|
enabled: {{ index .Values "aws-efs-csi-driver" "enabled" }}
|
||||||
values:
|
values:
|
||||||
|
{{- with index .Values "aws-efs-csi-driver" "nodeSelector" }}
|
||||||
aws-efs-csi-driver:
|
aws-efs-csi-driver:
|
||||||
nodeSelector:
|
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" }}
|
{{- with index .Values "aws-efs-csi-driver" "PersistentVolumes" }}
|
||||||
PersistentVolumes:
|
PersistentVolumes:
|
||||||
{{- toYaml . | nindent 8 }}
|
{{- toYaml . | nindent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- if index .Values "aws-efs-csi-driver" "PersistentVolume" }}
|
||||||
PersistentVolume:
|
PersistentVolume:
|
||||||
create: true
|
create: true
|
||||||
EfsId: {{ index .Values "aws-efs-csi-driver" "EfsId" }}
|
EfsId: {{ index .Values "aws-efs-csi-driver" "EfsId" }}
|
||||||
Name: {{ default "kubezero-efs-pv" ( index .Values "aws-efs-csi-driver" "PVName" ) }}
|
Name: {{ default "kubezero-efs-pv" ( index .Values "aws-efs-csi-driver" "PVName" ) }}
|
||||||
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
istio:
|
istio:
|
||||||
|
Loading…
Reference in New Issue
Block a user