From 5341b7f708aca195fdc0aa5e5a7c8e6d60b24690 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Thu, 1 Apr 2021 14:46:36 +0200 Subject: [PATCH] fix: Use latest livenessprobe for aws-efs-csi-driver to tackle memory leak --- charts/kubezero-aws-efs-csi-driver/Chart.yaml | 2 +- .../affinity_resources.patch | 23 ++++++++++++++----- .../charts/aws-efs-csi-driver/Chart.yaml | 2 +- .../aws-efs-csi-driver/templates/_helpers.tpl | 2 +- .../templates/controller-deployment.yaml | 2 -- .../templates/controller-serviceaccount.yaml | 4 ++-- .../charts/aws-efs-csi-driver/values.yaml | 6 ++--- charts/kubezero-aws-efs-csi-driver/update.sh | 2 +- 8 files changed, 26 insertions(+), 17 deletions(-) diff --git a/charts/kubezero-aws-efs-csi-driver/Chart.yaml b/charts/kubezero-aws-efs-csi-driver/Chart.yaml index d698900..439d858 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.2 +version: 0.3.3 appVersion: 1.2.0 kubeVersion: ">=1.18.0-0" home: https://kubezero.com diff --git a/charts/kubezero-aws-efs-csi-driver/affinity_resources.patch b/charts/kubezero-aws-efs-csi-driver/affinity_resources.patch index 7e9bd7e..60c546a 100644 --- a/charts/kubezero-aws-efs-csi-driver/affinity_resources.patch +++ b/charts/kubezero-aws-efs-csi-driver/affinity_resources.patch @@ -1,6 +1,6 @@ -diff -tubNr charts/aws-efs-csi-driver/templates/node-daemonset.yaml charts/aws-efs-csi-driver.zdt/templates/node-daemonset.yaml ---- charts/aws-efs-csi-driver/templates/node-daemonset.yaml 2021-03-19 00:22:54.000000000 +0100 -+++ charts/aws-efs-csi-driver.zdt/templates/node-daemonset.yaml 2021-03-24 13:06:56.105762451 +0100 +diff -tubrN charts/aws-efs-csi-driver/templates/node-daemonset.yaml charts/aws-efs-csi-driver.zdt/templates/node-daemonset.yaml +--- charts/aws-efs-csi-driver/templates/node-daemonset.yaml 2021-03-23 14:34:03.000000000 +0100 ++++ charts/aws-efs-csi-driver.zdt/templates/node-daemonset.yaml 2021-04-01 14:31:36.427375803 +0200 @@ -40,15 +40,10 @@ {{- with .Values.nodeSelector }} {{- . | toYaml | nindent 8 }} @@ -31,9 +31,20 @@ diff -tubNr charts/aws-efs-csi-driver/templates/node-daemonset.yaml charts/aws-e - name: csi-driver-registrar image: {{ printf "%s:%s" .Values.sidecars.nodeDriverRegistrarImage.repository .Values.sidecars.nodeDriverRegistrarImage.tag }} args: -diff -tubNr charts/aws-efs-csi-driver/values.yaml charts/aws-efs-csi-driver.zdt/values.yaml ---- charts/aws-efs-csi-driver/values.yaml 2021-03-19 00:22:54.000000000 +0100 -+++ charts/aws-efs-csi-driver.zdt/values.yaml 2021-03-24 13:06:56.105762451 +0100 +diff -tubrN charts/aws-efs-csi-driver/values.yaml charts/aws-efs-csi-driver.zdt/values.yaml +--- charts/aws-efs-csi-driver/values.yaml 2021-03-23 14:34:03.000000000 +0100 ++++ charts/aws-efs-csi-driver.zdt/values.yaml 2021-04-01 14:37:21.290724721 +0200 +@@ -11,8 +11,8 @@ + + sidecars: + livenessProbeImage: +- repository: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe +- tag: v2.1.0-eks-1-18-1 ++ repository: k8s.gcr.io/sig-storage/livenessprobe ++ tag: "v2.2.0" + nodeDriverRegistrarImage: + repository: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar + tag: v2.0.1-eks-1-18-1 @@ -43,7 +43,15 @@ tolerations: [] diff --git a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/Chart.yaml b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/Chart.yaml index b7d32af..4f1b11d 100644 --- a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/Chart.yaml +++ b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/Chart.yaml @@ -15,4 +15,4 @@ maintainers: name: aws-efs-csi-driver sources: - https://github.com/kubernetes-sigs/aws-efs-csi-driver -version: 1.2.1 +version: 1.2.2 diff --git a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/_helpers.tpl b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/_helpers.tpl index f0a743d..2b4ed0b 100644 --- a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/_helpers.tpl +++ b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/_helpers.tpl @@ -48,7 +48,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} Create the name of the service account to use */}} {{- define "aws-efs-csi-driver.serviceAccountName" -}} -{{- if .Values.serviceAccount.controller.create -}} +{{- if .Values.controller.create -}} {{ default (include "aws-efs-csi-driver.fullname" .) .Values.serviceAccount.controller.name }} {{- else -}} {{ default "default" .Values.serviceAccount.controller.name }} diff --git a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/controller-deployment.yaml b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/controller-deployment.yaml index d1c9901..122ffe2 100644 --- a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/controller-deployment.yaml +++ b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/controller-deployment.yaml @@ -34,9 +34,7 @@ spec: {{- with .Values.nodeSelector }} {{- . | toYaml | nindent 8 }} {{- end }} - {{- if .Values.serviceAccount.controller.create }} serviceAccountName: {{ include "aws-efs-csi-driver.serviceAccountName" . }} - {{- end }} priorityClassName: system-cluster-critical tolerations: - operator: Exists diff --git a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/controller-serviceaccount.yaml b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/controller-serviceaccount.yaml index 612713b..5a08044 100644 --- a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/controller-serviceaccount.yaml +++ b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/templates/controller-serviceaccount.yaml @@ -1,4 +1,4 @@ -{{- if .Values.serviceAccount.controller.create -}} +{{- if .Values.serviceAccount.controller.create }} apiVersion: v1 kind: ServiceAccount metadata: @@ -9,6 +9,7 @@ metadata: annotations: {{- toYaml . | nindent 4 }} {{- end }} +{{- end }} --- kind: ClusterRole @@ -56,4 +57,3 @@ roleRef: kind: ClusterRole name: efs-csi-external-provisioner-role apiGroup: rbac.authorization.k8s.io -{{- end }} diff --git a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/values.yaml b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/values.yaml index e1377c1..b175d57 100644 --- a/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/values.yaml +++ b/charts/kubezero-aws-efs-csi-driver/charts/aws-efs-csi-driver/values.yaml @@ -11,8 +11,8 @@ image: sidecars: livenessProbeImage: - repository: public.ecr.aws/eks-distro/kubernetes-csi/livenessprobe - tag: v2.1.0-eks-1-18-1 + repository: k8s.gcr.io/sig-storage/livenessprobe + tag: "v2.2.0" nodeDriverRegistrarImage: repository: public.ecr.aws/eks-distro/kubernetes-csi/node-driver-registrar tag: v2.0.1-eks-1-18-1 @@ -98,7 +98,7 @@ storageClasses: [] # - tls # parameters: # provisioningMode: efs-ap -# fileSystemId: fs-92107410 +# fileSystemId: fs-1122aabb # directoryPerms: "700" # gidRangeStart: "1000" # gidRangeEnd: "2000" diff --git a/charts/kubezero-aws-efs-csi-driver/update.sh b/charts/kubezero-aws-efs-csi-driver/update.sh index bc60b1b..3b19ef3 100755 --- a/charts/kubezero-aws-efs-csi-driver/update.sh +++ b/charts/kubezero-aws-efs-csi-driver/update.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.2.1 +VERSION=1.2.2 rm -rf charts/aws-efs-csi-driver curl -L -s -o - https://github.com/kubernetes-sigs/aws-efs-csi-driver/releases/download/helm-chart-aws-efs-csi-driver-${VERSION}/aws-efs-csi-driver-${VERSION}.tgz | tar xfz - -C charts