From 8fc803d4983afd60f4a4bb05170aafdb44ba0f84 Mon Sep 17 00:00:00 2001 From: Connor Catlett Date: Mon, 25 Mar 2024 16:43:19 +0000 Subject: [PATCH 1/2] Hardcode buildkit verison to 0.12.5 Signed-off-by: Connor Catlett --- hack/e2e/ecr.sh | 2 +- hack/prow.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hack/e2e/ecr.sh b/hack/e2e/ecr.sh index 9f5e4f0d25..18afd27af8 100644 --- a/hack/e2e/ecr.sh +++ b/hack/e2e/ecr.sh @@ -29,7 +29,7 @@ function ecr_build_and_push() { # Only setup buildx builder on Prow, allow local users to use docker cache if [ -n "${PROW_JOB_ID:-}" ]; then trap "docker buildx rm ebs-csi-multiarch-builder" EXIT - docker buildx create --bootstrap --use --name ebs-csi-multiarch-builder + docker buildx create --driver-opt=image=moby/buildkit:v0.12.5 --bootstrap --use --name ebs-csi-multiarch-builder docker run --rm --privileged multiarch/qemu-user-static --reset -p yes fi diff --git a/hack/prow.sh b/hack/prow.sh index d43b5650e3..bc0646f532 100755 --- a/hack/prow.sh +++ b/hack/prow.sh @@ -32,7 +32,7 @@ loudecho "Set up Docker Buildx" # and https://github.com/kubernetes-csi/csi-release-tools/blob/master/build.make#L132 export DOCKER_CLI_EXPERIMENTAL=enabled trap "docker buildx rm multiarchimage-buildertest" EXIT -docker buildx create --bootstrap --use --name multiarchimage-buildertest +docker buildx create --driver-opt=image=moby/buildkit:v0.12.5 --bootstrap --use --name multiarchimage-buildertest loudecho "Set up QEMU" # See https://github.com/docker/setup-qemu-action From af15f72e62d5dd05708b3394e411f0560a784ddf Mon Sep 17 00:00:00 2001 From: Drew Sirenko <68304519+AndrewSirenko@users.noreply.github.com> Date: Mon, 25 Mar 2024 20:46:40 +0000 Subject: [PATCH 2/2] Release aws-ebs-csi-driver v1.29.1 --- CHANGELOG.md | 4 ++++ Makefile | 2 +- README.md | 2 +- charts/aws-ebs-csi-driver/CHANGELOG.md | 4 ++++ charts/aws-ebs-csi-driver/Chart.yaml | 4 ++-- charts/aws-ebs-csi-driver/templates/NOTES.txt | 2 -- deploy/kubernetes/base/controller.yaml | 2 +- deploy/kubernetes/base/node.yaml | 2 +- 8 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2733032bab..3874dd65d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v1.29.1 +### Bug Fixes +* Correctly forward os.version for Windows images in multi-arch manifests ([#1985](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1985), [@ConnorJC3](https://github.com/ConnorJC3)) + # v1.29.0 ### Notable Changes * Implement KEP3751 ("ControllerModifyVolume") ([#1941](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/1941), [@ConnorJC3](https://github.com/ConnorJC3)) diff --git a/Makefile b/Makefile index 5412ffc9f4..b85a2045f4 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ ## Variables/Functions -VERSION?=v1.29.0 +VERSION?=v1.29.1 PKG=github.com/kubernetes-sigs/aws-ebs-csi-driver GIT_COMMIT?=$(shell git rev-parse HEAD) diff --git a/README.md b/README.md index 3f5c46cc72..92245105a8 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ The [Amazon Elastic Block Store](https://aws.amazon.com/ebs/) Container Storage | Driver Version | [registry.k8s.io](https://kubernetes.io/blog/2022/11/28/registry-k8s-io-faster-cheaper-ga/) Image | [ECR Public](https://gallery.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver) Image | |----------------|---------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------| -| v1.29.0 | registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.29.0 | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.29.0 | +| v1.29.1 | registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.29.1 | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.29.1 | | v1.28.0 | registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.28.0 | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.28.0 | ## Releases diff --git a/charts/aws-ebs-csi-driver/CHANGELOG.md b/charts/aws-ebs-csi-driver/CHANGELOG.md index 3b6a0c86b8..56aaf3d4d7 100644 --- a/charts/aws-ebs-csi-driver/CHANGELOG.md +++ b/charts/aws-ebs-csi-driver/CHANGELOG.md @@ -1,4 +1,8 @@ # Helm chart +## v2.29.1 +* Bump driver version to `v1.29.1` +* Remove `--reuse-values` deprecation warning + ## v2.29.0 ### Urgent Upgrade Notes *(No, really, you MUST read this before you upgrade)* diff --git a/charts/aws-ebs-csi-driver/Chart.yaml b/charts/aws-ebs-csi-driver/Chart.yaml index 185add521a..f64d06226e 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.29.0 +appVersion: 1.29.1 name: aws-ebs-csi-driver description: A Helm chart for AWS EBS CSI Driver -version: 2.29.0 +version: 2.29.1 kubeVersion: ">=1.17.0-0" home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver sources: diff --git a/charts/aws-ebs-csi-driver/templates/NOTES.txt b/charts/aws-ebs-csi-driver/templates/NOTES.txt index 4160affa94..cb3e6cecf6 100644 --- a/charts/aws-ebs-csi-driver/templates/NOTES.txt +++ b/charts/aws-ebs-csi-driver/templates/NOTES.txt @@ -3,5 +3,3 @@ To verify that aws-ebs-csi-driver has started, run: kubectl get pod -n {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "aws-ebs-csi-driver.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" NOTE: The [CSI Snapshotter](https://github.com/kubernetes-csi/external-snapshotter) controller and CRDs will no longer be installed as part of this chart and moving forward will be a prerequisite of using the snap shotting functionality. - -WARNING: Upgrading the EBS CSI Driver Helm chart with --reuse-values will no longer be supported in a future release. For more information, see https://github.com/kubernetes-sigs/aws-ebs-csi-driver/issues/1864 diff --git a/deploy/kubernetes/base/controller.yaml b/deploy/kubernetes/base/controller.yaml index d2c6d04eb8..a462b85393 100644 --- a/deploy/kubernetes/base/controller.yaml +++ b/deploy/kubernetes/base/controller.yaml @@ -62,7 +62,7 @@ spec: runAsUser: 1000 containers: - name: ebs-plugin - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.29.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.29.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 403ac11bd7..c9f289927e 100644 --- a/deploy/kubernetes/base/node.yaml +++ b/deploy/kubernetes/base/node.yaml @@ -53,7 +53,7 @@ spec: runAsUser: 0 containers: - name: ebs-plugin - image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.29.0 + image: public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.29.1 imagePullPolicy: IfNotPresent args: - node