From b28a5af2f7cba37ad4fbaef8edbb2cedc3c64bb6 Mon Sep 17 00:00:00 2001 From: temp Date: Wed, 22 Feb 2023 11:26:35 -0500 Subject: [PATCH 1/2] no-op commit due to failed cherry-picking From 16a151a867186088aebb11f0036fb4c8d4930cc5 Mon Sep 17 00:00:00 2001 From: David Yu Date: Wed, 22 Feb 2023 08:25:59 -0800 Subject: [PATCH 2/2] merge conflict --- CHANGELOG.md | 4 ++++ control-plane/Dockerfile | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 75beb62542..9bd8714c8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## UNRELEASED +IMPROVEMENTS: +* Control Plane + * Update alpine to 3.17 in the Docker image. [[GH-1934](https://github.com/hashicorp/consul-k8s/pull/1934)] + ## 0.49.4 (February 7, 2023) BREAKING CHANGES: diff --git a/control-plane/Dockerfile b/control-plane/Dockerfile index 5a418b5bf4..8d23426673 100644 --- a/control-plane/Dockerfile +++ b/control-plane/Dockerfile @@ -15,7 +15,7 @@ # ----------------------------------- # BIN_NAME is a requirement in the hashicorp docker github action -FROM alpine:3.16 AS dev +FROM alpine:3.17 AS dev # NAME and VERSION are the name of the software in releases.hashicorp.com # and the version to download. Example: NAME=consul VERSION=1.2.3. @@ -66,7 +66,7 @@ CMD /bin/${BIN_NAME} # We don't rebuild the software because we want the exact checksums and # binary signatures to match the software and our builds aren't fully # reproducible currently. -FROM alpine:3.16 AS release-default +FROM alpine:3.17 AS release-default ARG BIN_NAME=consul-k8s-control-plane ARG CNI_BIN_NAME=consul-cni