From f766aa5ec4fed865b4eb7c1924af6d2946c9062b Mon Sep 17 00:00:00 2001 From: David Yu Date: Wed, 16 Nov 2022 00:27:03 +0000 Subject: [PATCH 1/4] backport of commit a6f01f36a8ac775539f47bf5036d420e50228814 --- control-plane/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control-plane/Dockerfile b/control-plane/Dockerfile index 802ec4fab2..7b1805b044 100644 --- a/control-plane/Dockerfile +++ b/control-plane/Dockerfile @@ -111,7 +111,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 registry.access.redhat.com/ubi8/ubi-minimal:8.6 as ubi +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7 as ubi ARG PRODUCT_NAME ARG PRODUCT_VERSION From 9c0743ea3be713eb53096cba3653f25e4afa383f Mon Sep 17 00:00:00 2001 From: David Yu Date: Wed, 16 Nov 2022 11:20:28 -0800 Subject: [PATCH 2/4] Update Dockerfile --- control-plane/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control-plane/Dockerfile b/control-plane/Dockerfile index 7b1805b044..921ac69784 100644 --- a/control-plane/Dockerfile +++ b/control-plane/Dockerfile @@ -111,7 +111,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 registry.access.redhat.com/ubi8/ubi-minimal:8.7 as ubi +FROM registry.access.redhat.com/ubi9-minimal:9.1.0 as ubi ARG PRODUCT_NAME ARG PRODUCT_VERSION From 73293e2999142184413710b038865f296082c51c Mon Sep 17 00:00:00 2001 From: David Yu Date: Wed, 16 Nov 2022 11:22:11 -0800 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 972080f00e..7ff13ded06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## UNRELEASED +IMPROVEMENTS: +* Control Plane + * Bump Dockerfile base image for RedHat UBI `consul-k8s-control-plane` image to `ubi-minimal:9.1`. [[GH-1725][https://github.com/hashicorp/consul-k8s/pull/1725]] + ## 0.49.1 (November 14, 2022) BREAKING CHANGES: * Peering: From 420f3bbd06cff291194aca84668d143217e68689 Mon Sep 17 00:00:00 2001 From: David Yu Date: Wed, 16 Nov 2022 11:24:47 -0800 Subject: [PATCH 4/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ff13ded06..c143631db7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ IMPROVEMENTS: * Control Plane - * Bump Dockerfile base image for RedHat UBI `consul-k8s-control-plane` image to `ubi-minimal:9.1`. [[GH-1725][https://github.com/hashicorp/consul-k8s/pull/1725]] + * Bump Dockerfile base image for RedHat UBI `consul-k8s-control-plane` image to `ubi-minimal:9.1`. [[GH-1725](https://github.com/hashicorp/consul-k8s/pull/1725)] ## 0.49.1 (November 14, 2022) BREAKING CHANGES: