From 2ae562b0abad58a0fe2fb84e72710eae64f1a133 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Wed, 27 Jan 2021 17:01:05 -0800 Subject: [PATCH] update sidecar image version --- charts/aws-ebs-csi-driver/Chart.yaml | 2 +- .../templates/clusterrole-attacher.yaml | 3 +++ .../templates/clusterrole-provisioner.yaml | 2 +- charts/aws-ebs-csi-driver/values.yaml | 8 ++++---- deploy/kubernetes/base/controller.yaml | 4 ++-- deploy/kubernetes/base/node.yaml | 2 +- .../kubernetes/overlays/alpha/controller_add_resizer.yaml | 3 ++- .../kubernetes/overlays/stable/arm64/kustomization.yaml | 6 +++--- deploy/kubernetes/overlays/stable/ecr/kustomization.yaml | 3 +-- deploy/kubernetes/overlays/stable/kustomization.yaml | 6 +++--- 10 files changed, 21 insertions(+), 18 deletions(-) diff --git a/charts/aws-ebs-csi-driver/Chart.yaml b/charts/aws-ebs-csi-driver/Chart.yaml index 4814b7f96f..2e005b4c6a 100644 --- a/charts/aws-ebs-csi-driver/Chart.yaml +++ b/charts/aws-ebs-csi-driver/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "0.8.1" name: aws-ebs-csi-driver description: A Helm chart for AWS EBS CSI Driver version: 0.8.2 -kubeVersion: ">=1.14.0-0" +kubeVersion: ">=1.17.0-0" home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver sources: - https://github.com/kubernetes-sigs/aws-ebs-csi-driver diff --git a/charts/aws-ebs-csi-driver/templates/clusterrole-attacher.yaml b/charts/aws-ebs-csi-driver/templates/clusterrole-attacher.yaml index c4b766a36a..e0919cec14 100644 --- a/charts/aws-ebs-csi-driver/templates/clusterrole-attacher.yaml +++ b/charts/aws-ebs-csi-driver/templates/clusterrole-attacher.yaml @@ -18,3 +18,6 @@ rules: - apiGroups: ["storage.k8s.io"] resources: ["volumeattachments"] verbs: ["get", "list", "watch", "update", "patch"] + - apiGroups: [ "storage.k8s.io" ] + resources: [ "volumeattachments/status" ] + verbs: [ "patch" ] diff --git a/charts/aws-ebs-csi-driver/templates/clusterrole-provisioner.yaml b/charts/aws-ebs-csi-driver/templates/clusterrole-provisioner.yaml index fa313949a6..0fb7ded0fc 100644 --- a/charts/aws-ebs-csi-driver/templates/clusterrole-provisioner.yaml +++ b/charts/aws-ebs-csi-driver/templates/clusterrole-provisioner.yaml @@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: ebs-external-provisioner-role labels: - { { - include "aws-ebs-csi-driver.labels" . | nindent 4 } } + {{- include "aws-ebs-csi-driver.labels" . | nindent 4 }} rules: - apiGroups: [ "" ] resources: [ "persistentvolumes" ] diff --git a/charts/aws-ebs-csi-driver/values.yaml b/charts/aws-ebs-csi-driver/values.yaml index fdacbac7ae..e1e6fedf26 100644 --- a/charts/aws-ebs-csi-driver/values.yaml +++ b/charts/aws-ebs-csi-driver/values.yaml @@ -12,10 +12,10 @@ image: sidecars: provisionerImage: repository: quay.io/k8scsi/csi-provisioner - tag: "v2.1.0" + tag: "v2.0.0" attacherImage: repository: quay.io/k8scsi/csi-attacher - tag: "v2.2.0" + tag: "v3.0.0" snapshotterImage: repository: quay.io/k8scsi/csi-snapshotter tag: "v2.1.1" @@ -24,10 +24,10 @@ sidecars: tag: "v2.1.0" resizerImage: repository: quay.io/k8scsi/csi-resizer - tag: "v0.5.0" + tag: "v1.0.0" nodeDriverRegistrarImage: repository: quay.io/k8scsi/csi-node-driver-registrar - tag: "v1.3.0" + tag: "v2.0.1" imagePullSecrets: [] nameOverride: "" diff --git a/deploy/kubernetes/base/controller.yaml b/deploy/kubernetes/base/controller.yaml index f4d707c758..8ed806ffb5 100644 --- a/deploy/kubernetes/base/controller.yaml +++ b/deploy/kubernetes/base/controller.yaml @@ -66,7 +66,7 @@ spec: periodSeconds: 10 failureThreshold: 5 - name: csi-provisioner - image: quay.io/k8scsi/csi-provisioner:v2.1.0 + image: quay.io/k8scsi/csi-provisioner:v2.0.0 args: - --csi-address=$(ADDRESS) - --v=5 @@ -80,7 +80,7 @@ spec: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ - name: csi-attacher - image: quay.io/k8scsi/csi-attacher:v2.2.0 + image: quay.io/k8scsi/csi-attacher:v3.0.0 args: - --csi-address=$(ADDRESS) - --v=5 diff --git a/deploy/kubernetes/base/node.yaml b/deploy/kubernetes/base/node.yaml index 1853df522c..56e7a4f77c 100644 --- a/deploy/kubernetes/base/node.yaml +++ b/deploy/kubernetes/base/node.yaml @@ -68,7 +68,7 @@ spec: periodSeconds: 10 failureThreshold: 5 - name: node-driver-registrar - image: quay.io/k8scsi/csi-node-driver-registrar:v1.3.0 + image: quay.io/k8scsi/csi-node-driver-registrar:v2.0.1 args: - --csi-address=$(ADDRESS) - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) diff --git a/deploy/kubernetes/overlays/alpha/controller_add_resizer.yaml b/deploy/kubernetes/overlays/alpha/controller_add_resizer.yaml index db7f8002ad..9acd0c7e91 100644 --- a/deploy/kubernetes/overlays/alpha/controller_add_resizer.yaml +++ b/deploy/kubernetes/overlays/alpha/controller_add_resizer.yaml @@ -8,10 +8,11 @@ spec: spec: containers: - name: csi-resizer - image: quay.io/k8scsi/csi-resizer:v0.3.0 + image: quay.io/k8scsi/csi-resizer:v1.0.0 args: - --csi-address=$(ADDRESS) - --v=5 + - --handle-volume-inuse-error=false env: - name: ADDRESS value: /var/lib/csi/sockets/pluginproxy/csi.sock diff --git a/deploy/kubernetes/overlays/stable/arm64/kustomization.yaml b/deploy/kubernetes/overlays/stable/arm64/kustomization.yaml index b2eb2d97c1..7a5076837d 100644 --- a/deploy/kubernetes/overlays/stable/arm64/kustomization.yaml +++ b/deploy/kubernetes/overlays/stable/arm64/kustomization.yaml @@ -7,13 +7,13 @@ images: newTag: v0.8.1 - name: quay.io/k8scsi/csi-provisioner newName: raspbernetes/csi-external-provisioner - newTag: "2.1.0" + newTag: "2.0.0" - name: quay.io/k8scsi/csi-attacher newName: raspbernetes/csi-external-attacher - newTag: "2.2.0" + newTag: "3.0.0" - name: quay.io/k8scsi/livenessprobe newName: k8s.gcr.io/sig-storage/livenessprobe newTag: "v2.1.0" - name: quay.io/k8scsi/csi-node-driver-registrar newName: raspbernetes/csi-node-driver-registrar - newTag: "1.3.0" + newTag: "2.0.1" diff --git a/deploy/kubernetes/overlays/stable/ecr/kustomization.yaml b/deploy/kubernetes/overlays/stable/ecr/kustomization.yaml index 533bbc95de..547a4e828c 100644 --- a/deploy/kubernetes/overlays/stable/ecr/kustomization.yaml +++ b/deploy/kubernetes/overlays/stable/ecr/kustomization.yaml @@ -7,8 +7,7 @@ images: newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/aws-ebs-csi-driver newTag: v0.7.1 - name: quay.io/k8scsi/csi-provisioner - newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-provisioner - newTag: v2.1.0 + newName: v1.5.0 - name: quay.io/k8scsi/csi-attacher newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-attacher newTag: v1.2.0 diff --git a/deploy/kubernetes/overlays/stable/kustomization.yaml b/deploy/kubernetes/overlays/stable/kustomization.yaml index 230a6a7663..98750e38e3 100644 --- a/deploy/kubernetes/overlays/stable/kustomization.yaml +++ b/deploy/kubernetes/overlays/stable/kustomization.yaml @@ -6,10 +6,10 @@ images: - name: k8s.gcr.io/provider-aws/aws-ebs-csi-driver newTag: v0.8.1 - name: quay.io/k8scsi/csi-provisioner - newTag: v2.1.0 + newTag: v2.0.0 - name: quay.io/k8scsi/csi-attacher - newTag: v2.2.0 + newTag: v3.0.0 - name: quay.io/k8scsi/livenessprobe newTag: v2.1.0 - name: quay.io/k8scsi/csi-node-driver-registrar - newTag: v1.3.0 + newTag: v2.0.1