diff --git a/charts/kubezero-aws-efs-csi-driver/Chart.yaml b/charts/kubezero-aws-efs-csi-driver/Chart.yaml index 52816ca..8bd4a5d 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 3180d4a..0000000 --- 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 f7a6e88..3943518 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 32342bf..5ad6088 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: "" diff --git a/charts/kubezero-kiam/Chart.yaml b/charts/kubezero-kiam/Chart.yaml index b3d14ed..c7b5eb0 100644 --- a/charts/kubezero-kiam/Chart.yaml +++ b/charts/kubezero-kiam/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-kiam description: KubeZero Umbrella Chart for Kiam type: application -version: 0.3.2 +version: 0.3.3 appVersion: "4.0" home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png diff --git a/charts/kubezero-kiam/values.yaml b/charts/kubezero-kiam/values.yaml index 39eab1d..8f1b8da 100644 --- a/charts/kubezero-kiam/values.yaml +++ b/charts/kubezero-kiam/values.yaml @@ -21,10 +21,10 @@ kiam: updateStrategy: RollingUpdate resources: requests: - memory: "50Mi" + memory: "64Mi" cpu: "50m" limits: - memory: "100Mi" + memory: "128Mi" # cpu: "300m" tolerations: - key: node-role.kubernetes.io/master @@ -57,10 +57,10 @@ kiam: caFileName: ca.crt resources: requests: - memory: "20Mi" + memory: "16Mi" cpu: "50m" limits: - memory: "20Mi" + memory: "64Mi" # cpu: "50m" tolerations: - key: node-role.kubernetes.io/master diff --git a/docs/etcd_hackery.md b/docs/etcd_hackery.md new file mode 100644 index 0000000..0551229 --- /dev/null +++ b/docs/etcd_hackery.md @@ -0,0 +1,11 @@ +# How to extract or even edit etcd data directly + +## Get Auger +https://github.com/jpbetz/auger + +## Change a PV object +etcdctl get /registry/persistentvolumes/services-dsny-cache | auger decode > pv.yaml + +vi pv.yaml + +cat pv.yaml | auger encode | etcdctl put /registry/persistentvolumes/services-dsny-cache