From 1fd55e983e3ad62b5ee0972f85c4fd25d91c3d57 Mon Sep 17 00:00:00 2001 From: Eddie Torres Date: Thu, 28 Apr 2022 21:26:26 +0000 Subject: [PATCH 1/2] Prepare for release v1.6.1 Signed-off-by: Eddie Torres --- .github/workflows/release.yaml | 2 +- CHANGELOG-0.x.md | 4 ++++ Makefile | 2 +- docs/README.md | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c5efce058d..2a55e3af87 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -23,4 +23,4 @@ jobs: ## CHANGELOG See [CHANGELOG](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/blob/master/CHANGELOG-0.x.md) for full list of changes draft: false - prerelease: false + prerelease: true diff --git a/CHANGELOG-0.x.md b/CHANGELOG-0.x.md index c17d9cbd25..6ba36e6076 100644 --- a/CHANGELOG-0.x.md +++ b/CHANGELOG-0.x.md @@ -1,3 +1,7 @@ +# v1.6.1 +## Notable changes +* Address CVE ALAS2-2022-1782, ALAS2-2022-1788, ALAS2-2022-1784 + # v1.6.0 ## Notable changes * Platform agnostic device removal ([#1193](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1193), [@torredil](https://github.com/torredil)) diff --git a/Makefile b/Makefile index 471d21ead6..1361a41d2d 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -VERSION=v1.6.0 +VERSION=v1.6.1 PKG=github.com/kubernetes-sigs/aws-ebs-csi-driver GIT_COMMIT?=$(shell git rev-parse HEAD) diff --git a/docs/README.md b/docs/README.md index d44537070b..4517160564 100644 --- a/docs/README.md +++ b/docs/README.md @@ -84,6 +84,7 @@ Following sections are Kubernetes specific. If you are Kubernetes user, use foll ## Container Images: |AWS EBS CSI Driver Version | GCR Image | ECR Image | |---------------------------|--------------------------------------------------|-----------------------------------------------------------------------------| +|v1.6.1 | | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.6.1 | |v1.6.0 | | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.6.0 | |v1.5.3 | | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.5.3 | |v1.5.2 | | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.5.2 | From 134687ad69a7d738d7e77e2e34459a43926d013e Mon Sep 17 00:00:00 2001 From: Eddie Torres Date: Mon, 2 May 2022 22:01:01 +0000 Subject: [PATCH 2/2] Driver v1.6.1 post-release Signed-off-by: Eddie Torres --- .github/workflows/release.yaml | 2 +- charts/aws-ebs-csi-driver/CHANGELOG.md | 4 ++++ charts/aws-ebs-csi-driver/Chart.yaml | 4 ++-- deploy/kubernetes/base/controller.yaml | 2 +- deploy/kubernetes/base/node.yaml | 2 +- deploy/kubernetes/overlays/stable/gcr/kustomization.yaml | 2 +- docs/RELEASE.md | 4 ++-- examples/kubernetes/windows/README.md | 2 +- 8 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2a55e3af87..c5efce058d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -23,4 +23,4 @@ jobs: ## CHANGELOG See [CHANGELOG](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/blob/master/CHANGELOG-0.x.md) for full list of changes draft: false - prerelease: true + prerelease: false diff --git a/charts/aws-ebs-csi-driver/CHANGELOG.md b/charts/aws-ebs-csi-driver/CHANGELOG.md index d50c5b74d5..3f8559a68b 100644 --- a/charts/aws-ebs-csi-driver/CHANGELOG.md +++ b/charts/aws-ebs-csi-driver/CHANGELOG.md @@ -1,5 +1,9 @@ # Helm chart +## v2.6.7 + +* Bump app/driver to version `v1.6.1` + ## v2.6.6 * Bump app/driver to version `v1.6.0` diff --git a/charts/aws-ebs-csi-driver/Chart.yaml b/charts/aws-ebs-csi-driver/Chart.yaml index f3b9e6b03c..67c20099ea 100644 --- a/charts/aws-ebs-csi-driver/Chart.yaml +++ b/charts/aws-ebs-csi-driver/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 1.6.0 +appVersion: 1.6.1 name: aws-ebs-csi-driver description: A Helm chart for AWS EBS CSI Driver -version: 2.6.6 +version: 2.6.7 kubeVersion: ">=1.17.0-0" home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver sources: diff --git a/deploy/kubernetes/base/controller.yaml b/deploy/kubernetes/base/controller.yaml index 7b29a89d2a..03616b8320 100644 --- a/deploy/kubernetes/base/controller.yaml +++ b/deploy/kubernetes/base/controller.yaml @@ -31,7 +31,7 @@ spec: tolerationSeconds: 300 containers: - name: ebs-plugin - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.6.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.6.1 imagePullPolicy: IfNotPresent args: # - {all,controller,node} # specify the driver mode diff --git a/deploy/kubernetes/base/node.yaml b/deploy/kubernetes/base/node.yaml index 8e05e9c3a2..ba366bfad8 100644 --- a/deploy/kubernetes/base/node.yaml +++ b/deploy/kubernetes/base/node.yaml @@ -45,7 +45,7 @@ spec: - name: ebs-plugin securityContext: privileged: true - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.6.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.6.1 imagePullPolicy: IfNotPresent args: - node diff --git a/deploy/kubernetes/overlays/stable/gcr/kustomization.yaml b/deploy/kubernetes/overlays/stable/gcr/kustomization.yaml index 9cc93ef6dd..ef672a5515 100644 --- a/deploy/kubernetes/overlays/stable/gcr/kustomization.yaml +++ b/deploy/kubernetes/overlays/stable/gcr/kustomization.yaml @@ -4,7 +4,7 @@ bases: - ../../../base images: - name: k8s.gcr.io/provider-aws/aws-ebs-csi-driver - newTag: v1.6.0 + newTag: v1.6.1 - name: k8s.gcr.io/sig-storage/csi-provisioner newTag: v2.1.1 - name: k8s.gcr.io/sig-storage/csi-attacher diff --git a/docs/RELEASE.md b/docs/RELEASE.md index 355e95a116..980445d8d0 100644 --- a/docs/RELEASE.md +++ b/docs/RELEASE.md @@ -69,11 +69,11 @@ Follow the AWS-internal process. ## Verify the images are available In ECR Public: - - `docker pull public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.6.0` + - `docker pull public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.6.1` In ECR: - `aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin 602401143452.dkr.ecr.us-west-2.amazonaws.com` - - `docker pull 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/aws-ebs-csi-driver:v1.1.1` + - `docker pull 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/aws-ebs-csi-driver:v1.6.1` ## Create the post-release commit in the release branch diff --git a/examples/kubernetes/windows/README.md b/examples/kubernetes/windows/README.md index 7dd15bc4c6..13d35efaa0 100644 --- a/examples/kubernetes/windows/README.md +++ b/examples/kubernetes/windows/README.md @@ -6,7 +6,7 @@ This example shows how to create a EBS volume and consume it from a Windows cont 1. A 1.18+ Windows node. Windows support has only been tested on 1.18 EKS Windows nodes. https://docs.aws.amazon.com/eks/latest/userguide/windows-support.html 2. [csi-proxy](https://github.com/kubernetes-csi/csi-proxy) v1.0.0+ installed on the Windows node. -3. Driver v1.6.0 from ECR: `public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.6.0`. It can be built and pushed to another image registry with the command `TAG=$MY_TAG REGISTRY=$MY_REGISTRY make all-push` where `MY_TAG` refers to the image tag to push and `MY_REGISTRY` to the destination image registry like "XXXXXXXXXXXX.dkr.ecr.us-west-2.amazonaws.com" +3. Driver v1.6.1 from ECR: `public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.6.1`. It can be built and pushed to another image registry with the command `TAG=$MY_TAG REGISTRY=$MY_REGISTRY make all-push` where `MY_TAG` refers to the image tag to push and `MY_REGISTRY` to the destination image registry like "XXXXXXXXXXXX.dkr.ecr.us-west-2.amazonaws.com" 4. The driver installed with the Node plugin on the Windows node and the Controller plugin on a Linux node: `helm upgrade --install aws-ebs-csi-driver --namespace kube-system ./charts/aws-ebs-csi-driver --set node.enableWindows=true --set image.repository=$MY_REGISTRY/aws-ebs-csi-driver --set image.tag=$MY_TAG` ## Usage