From 4a9eb00f9d556ac4db4646fd3720c1ae642ace26 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Fri, 5 Mar 2021 10:32:42 +0100 Subject: [PATCH] aws-ebs-csi-driver version bump, remove cpu limts --- charts/kubezero-aws-ebs-csi-driver/Chart.yaml | 4 +- .../charts/aws-ebs-csi-driver/Chart.yaml | 2 +- .../templates/controller.yaml | 6 +++ .../aws-ebs-csi-driver/templates/node.yaml | 10 ++-- .../loglevel_leader.patch | 50 +++++++++---------- charts/kubezero-aws-ebs-csi-driver/update.sh | 2 +- .../kubezero-aws-ebs-csi-driver/values.yaml | 4 +- 7 files changed, 43 insertions(+), 35 deletions(-) diff --git a/charts/kubezero-aws-ebs-csi-driver/Chart.yaml b/charts/kubezero-aws-ebs-csi-driver/Chart.yaml index 30ac280b..23599cf0 100644 --- a/charts/kubezero-aws-ebs-csi-driver/Chart.yaml +++ b/charts/kubezero-aws-ebs-csi-driver/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: kubezero-aws-ebs-csi-driver description: KubeZero Umbrella Chart for aws-ebs-csi-driver type: application -version: 0.4.2 +version: 0.4.3 appVersion: 0.9.0 home: https://kubezero.com icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png @@ -18,7 +18,7 @@ maintainers: - name: Quarky9 dependencies: - name: aws-ebs-csi-driver - version: 0.9.13 + version: 0.9.14 repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver - name: kubezero-lib version: ">= 0.1.3" diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/Chart.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/Chart.yaml index 5804f5c5..9a5a2b96 100644 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/Chart.yaml +++ b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/Chart.yaml @@ -15,4 +15,4 @@ maintainers: name: aws-ebs-csi-driver sources: - https://github.com/kubernetes-sigs/aws-ebs-csi-driver -version: 0.9.13 +version: 0.9.14 diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/controller.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/controller.yaml index f84b1bc1..ccd74893 100644 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/controller.yaml +++ b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/controller.yaml @@ -33,6 +33,12 @@ spec: tolerations: {{- if .Values.tolerateAllTaints }} - operator: Exists + {{- else }} + - key: CriticalAddonsOnly + operator: Exists + - operator: Exists + effect: NoExecute + tolerationSeconds: 300 {{- end }} {{- with .Values.tolerations }} {{ toYaml . | indent 8 }} diff --git a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/node.yaml b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/node.yaml index 5de74697..5caeb33d 100644 --- a/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/node.yaml +++ b/charts/kubezero-aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/node.yaml @@ -39,6 +39,12 @@ spec: tolerations: {{- if .Values.node.tolerateAllTaints }} - operator: Exists + {{- else }} + - key: CriticalAddonsOnly + operator: Exists + - operator: Exists + effect: NoExecute + tolerationSeconds: 300 {{- end }} {{- with .Values.node.tolerations }} {{ toYaml . | indent 8 }} @@ -102,10 +108,6 @@ spec: - --csi-address=$(ADDRESS) - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) - --v={{ .Values.logLevel }} - lifecycle: - preStop: - exec: - command: ["/bin/sh", "-c", "rm -rf /registration/ebs.csi.aws.com-reg.sock /csi/csi.sock"] env: - name: ADDRESS value: /csi/csi.sock diff --git a/charts/kubezero-aws-ebs-csi-driver/loglevel_leader.patch b/charts/kubezero-aws-ebs-csi-driver/loglevel_leader.patch index 938d3046..349eea0a 100644 --- a/charts/kubezero-aws-ebs-csi-driver/loglevel_leader.patch +++ b/charts/kubezero-aws-ebs-csi-driver/loglevel_leader.patch @@ -1,7 +1,7 @@ -diff -rtub aws-ebs-csi-driver/templates/controller.yaml /tmp/aws-ebs-csi-driver/templates/controller.yaml ---- aws-ebs-csi-driver/templates/controller.yaml 2021-02-23 18:54:24.000000000 +0100 -+++ /tmp/aws-ebs-csi-driver/templates/controller.yaml 2021-02-24 18:40:00.753541864 +0100 -@@ -56,7 +56,7 @@ +diff -rtubN aws-ebs-csi-driver.orig/templates/controller.yaml aws-ebs-csi-driver/templates/controller.yaml +--- aws-ebs-csi-driver.orig/templates/controller.yaml 2021-03-05 03:10:41.000000000 +0100 ++++ aws-ebs-csi-driver/templates/controller.yaml 2021-03-05 10:29:31.878615411 +0100 +@@ -68,7 +68,7 @@ - --k8s-tag-cluster-id={{ .Values.k8sTagClusterId }} {{- end }} - --logtostderr @@ -10,7 +10,7 @@ diff -rtub aws-ebs-csi-driver/templates/controller.yaml /tmp/aws-ebs-csi-driver/ env: - name: CSI_ENDPOINT value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock -@@ -98,14 +98,14 @@ +@@ -126,14 +126,14 @@ image: {{ printf "%s:%s" .Values.sidecars.provisionerImage.repository .Values.sidecars.provisionerImage.tag }} args: - --csi-address=$(ADDRESS) @@ -27,7 +27,7 @@ diff -rtub aws-ebs-csi-driver/templates/controller.yaml /tmp/aws-ebs-csi-driver/ - --default-fstype=ext4 env: - name: ADDRESS -@@ -120,8 +120,8 @@ +@@ -156,8 +156,8 @@ image: {{ printf "%s:%s" .Values.sidecars.attacherImage.repository .Values.sidecars.attacherImage.tag }} args: - --csi-address=$(ADDRESS) @@ -38,7 +38,7 @@ diff -rtub aws-ebs-csi-driver/templates/controller.yaml /tmp/aws-ebs-csi-driver/ env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock -@@ -136,7 +136,7 @@ +@@ -180,7 +180,7 @@ image: {{ printf "%s:%s" .Values.sidecars.snapshotterImage.repository .Values.sidecars.snapshotterImage.tag }} args: - --csi-address=$(ADDRESS) @@ -47,7 +47,7 @@ diff -rtub aws-ebs-csi-driver/templates/controller.yaml /tmp/aws-ebs-csi-driver/ env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock -@@ -153,7 +153,7 @@ +@@ -205,7 +205,7 @@ imagePullPolicy: Always args: - --csi-address=$(ADDRESS) @@ -56,10 +56,10 @@ diff -rtub aws-ebs-csi-driver/templates/controller.yaml /tmp/aws-ebs-csi-driver/ env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock -diff -rtub aws-ebs-csi-driver/templates/node.yaml /tmp/aws-ebs-csi-driver/templates/node.yaml ---- aws-ebs-csi-driver/templates/node.yaml 2021-02-23 18:54:24.000000000 +0100 -+++ /tmp/aws-ebs-csi-driver/templates/node.yaml 2021-02-24 18:41:44.630213228 +0100 -@@ -56,7 +56,7 @@ +diff -rtubN aws-ebs-csi-driver.orig/templates/node.yaml aws-ebs-csi-driver/templates/node.yaml +--- aws-ebs-csi-driver.orig/templates/node.yaml 2021-03-05 03:10:41.000000000 +0100 ++++ aws-ebs-csi-driver/templates/node.yaml 2021-03-05 10:30:07.391950366 +0100 +@@ -61,7 +61,7 @@ - --volume-attach-limit={{ .Values.volumeAttachLimit }} {{- end }} - --logtostderr @@ -68,30 +68,30 @@ diff -rtub aws-ebs-csi-driver/templates/node.yaml /tmp/aws-ebs-csi-driver/templa env: - name: CSI_ENDPOINT value: unix:/csi/csi.sock -@@ -94,7 +94,7 @@ +@@ -107,7 +107,7 @@ args: - --csi-address=$(ADDRESS) - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) - - --v=5 + - --v={{ .Values.logLevel }} - lifecycle: - preStop: - exec: -diff -rtub aws-ebs-csi-driver/templates/statefulset.yaml /tmp/aws-ebs-csi-driver/templates/statefulset.yaml ---- aws-ebs-csi-driver/templates/statefulset.yaml 2021-02-23 18:54:24.000000000 +0100 -+++ /tmp/aws-ebs-csi-driver/templates/statefulset.yaml 2021-02-24 18:42:07.223547582 +0100 -@@ -41,7 +41,7 @@ - - name: snapshot-controller - image: {{ printf "%s:%s" .Values.snapshotController.repository .Values.snapshotController.tag }} + env: + - name: ADDRESS + value: /csi/csi.sock +diff -rtubN aws-ebs-csi-driver.orig/templates/statefulset.yaml aws-ebs-csi-driver/templates/statefulset.yaml +--- aws-ebs-csi-driver.orig/templates/statefulset.yaml 2021-03-05 03:10:41.000000000 +0100 ++++ aws-ebs-csi-driver/templates/statefulset.yaml 2021-03-05 10:29:31.881948744 +0100 +@@ -49,7 +49,7 @@ + value: {{ .Values.proxy.no_proxy | quote }} + {{- end }} args: - - --v=5 + - --v={{ .Values.logLevel }} - --leader-election=false {{- if .Values.imagePullSecrets }} imagePullSecrets: -diff -rtub aws-ebs-csi-driver/values.yaml /tmp/aws-ebs-csi-driver/values.yaml ---- aws-ebs-csi-driver/values.yaml 2021-02-23 18:54:24.000000000 +0100 -+++ /tmp/aws-ebs-csi-driver/values.yaml 2021-02-24 18:41:15.513545244 +0100 +diff -rtubN aws-ebs-csi-driver.orig/values.yaml aws-ebs-csi-driver/values.yaml +--- aws-ebs-csi-driver.orig/values.yaml 2021-03-05 03:10:41.000000000 +0100 ++++ aws-ebs-csi-driver/values.yaml 2021-03-05 10:29:31.881948744 +0100 @@ -9,6 +9,8 @@ tag: "v0.9.0" pullPolicy: IfNotPresent diff --git a/charts/kubezero-aws-ebs-csi-driver/update.sh b/charts/kubezero-aws-ebs-csi-driver/update.sh index afa8703f..e748fa36 100755 --- a/charts/kubezero-aws-ebs-csi-driver/update.sh +++ b/charts/kubezero-aws-ebs-csi-driver/update.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=0.9.13 +VERSION=0.9.14 rm -rf charts/aws-ebs-csi-driver curl -L -s -o - https://github.com/kubernetes-sigs/aws-ebs-csi-driver/releases/download/helm-chart-aws-ebs-csi-driver-${VERSION}/aws-ebs-csi-driver-${VERSION}.tgz | tar xfz - -C charts diff --git a/charts/kubezero-aws-ebs-csi-driver/values.yaml b/charts/kubezero-aws-ebs-csi-driver/values.yaml index 7ca7b724..b7cee728 100644 --- a/charts/kubezero-aws-ebs-csi-driver/values.yaml +++ b/charts/kubezero-aws-ebs-csi-driver/values.yaml @@ -23,10 +23,10 @@ aws-ebs-csi-driver: resources: requests: - cpu: 5m + cpu: 50m memory: 24Mi limits: - cpu: 50m + # cpu: 50m memory: 40Mi storageClasses: