From 828f0a73d3f678c3ee013109e6ae131358ed94fa Mon Sep 17 00:00:00 2001 From: Eddie Torres Date: Wed, 15 Jun 2022 20:44:38 +0000 Subject: [PATCH 1/2] Change base image from AL2 to EKS minimal Signed-off-by: Eddie Torres --- Dockerfile | 5 +---- Makefile | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6098b5e706..2a64810936 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,10 +22,7 @@ ARG TARGETOS ARG TARGETARCH RUN OS=$TARGETOS ARCH=$TARGETARCH make $TARGETOS/$TARGETARCH -FROM amazonlinux:2 AS linux-amazon -RUN yum update -y && \ - yum install ca-certificates e2fsprogs xfsprogs util-linux -y && \ - yum clean all +FROM public.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-csi-ebs:latest.2 AS linux-amazon COPY --from=builder /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver/bin/aws-ebs-csi-driver /bin/aws-ebs-csi-driver ENTRYPOINT ["/bin/aws-ebs-csi-driver"] diff --git a/Makefile b/Makefile index d5f11e4e72..f58674f020 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,6 @@ sub-image-%: image: .image-$(TAG)-$(OS)-$(ARCH)-$(OSVERSION) .image-$(TAG)-$(OS)-$(ARCH)-$(OSVERSION): docker buildx build \ - --no-cache-filter=linux-amazon \ --platform=$(OS)/$(ARCH) \ --progress=plain \ --target=$(OS)-$(OSVERSION) \ From 2d29aefc416cd377292bff2e070ca68d70e5fa42 Mon Sep 17 00:00:00 2001 From: Eddie Torres Date: Mon, 27 Jun 2022 18:59:59 +0000 Subject: [PATCH 2/2] Prepare for release v1.8.0 Signed-off-by: Eddie Torres --- CHANGELOG.md | 8 ++++++++ Makefile | 2 +- README.md | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f94f85c68..141d291612 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v1.8.0 +## Notable Changes +* Change base image from Amazon Linux 2 to EKS minimal for linux builds + +### Acknowledgments +* We would like to sincerely thank: +[@jaxesn](https://github.com/jaxesn) + # v1.7.0 ## Announcement * To improve the security of the container images, the base image will be switched from [Amazon Linux 2](https://hub.docker.com/_/amazonlinux) to [EKS Distro Minimal](https://gallery.ecr.aws/eks-distro-build-tooling/eks-distro-minimal-base-csi-ebs) in an upcoming release. The new minimal base image only contains the necessary driver dependencies which means it will not include a shell. **Please be aware that while this change won't break workloads, it may break processes for debugging if you are using a shell**. diff --git a/Makefile b/Makefile index f58674f020..edc48d5d0b 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.7.0 +VERSION=v1.8.0 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 da248ea30d..b482fa1a14 100644 --- a/README.md +++ b/README.md @@ -20,13 +20,14 @@ The [Amazon Elastic Block Store](https://aws.amazon.com/ebs/) Container Storage |Driver Version | [GCR](https://us.gcr.io/k8s-artifacts-prod/provider-aws/aws-ebs-csi-driver ) Image | [ECR](https://gallery.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver) Image | |---------------------------|--------------------------------------------------|-----------------------------------------------------------------------------| -|v1.7.0 |k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.7.0 | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.7.0 | +|v1.8.0 |k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.8.0 | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.8.0 |
Previous Images |Driver Version | [GCR](https://us.gcr.io/k8s-artifacts-prod/provider-aws/aws-ebs-csi-driver ) Image | [ECR](https://gallery.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver) Image | |---------------------------|--------------------------------------------------|-----------------------------------------------------------------------------| +|v1.7.0 |k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.7.0 | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.7.0 | |v1.6.2 |k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.6.2 | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.6.2 | |v1.6.1 |k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.6.1 | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.6.1 | |v1.6.0 |k8s.gcr.io/provider-aws/aws-ebs-csi-driver:v1.6.0 | public.ecr.aws/ebs-csi-driver/aws-ebs-csi-driver:v1.6.0 |