From 0074139b149321f654e32f4243c274cb8a43872e Mon Sep 17 00:00:00 2001 From: David Yu Date: Tue, 7 Feb 2023 02:17:33 +0000 Subject: [PATCH 1/2] backport of commit 369db30cde8b61ac35c9ab096b1311572848cd4d --- control-plane/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control-plane/Dockerfile b/control-plane/Dockerfile index ee20f8bb61..2989712a5f 100644 --- a/control-plane/Dockerfile +++ b/control-plane/Dockerfile @@ -41,7 +41,7 @@ LABEL name=${BIN_NAME} \ ENV BIN_NAME=${BIN_NAME} ENV VERSION=${VERSION} -RUN apk add --no-cache ca-certificates gnupg libcap openssl su-exec iputils libc6-compat iptables +RUN apk add --no-cache ca-certificates libcap openssl su-exec iputils libc6-compat iptables # Create a non-root user to run the software. RUN addgroup ${BIN_NAME} && \ From 14c4ace17d69c6b92a9fa8a6541d7c2c43deed63 Mon Sep 17 00:00:00 2001 From: David Yu Date: Mon, 6 Feb 2023 20:03:32 -0800 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea7cda7dbd..dd374f8312 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ BREAKING CHANGES: IMPROVEMENTS: * Control Plane - * Remove extraneous `gnupg` depdency from `consul-k8s-control-plane` since it is no longer needed for validating binary artifacts prior to release. [[GH-1882](https://github.com/hashicorp/consul-k8s/pull/1882)] + * Remove extraneous `gnupg` dependency from `consul-k8s-control-plane` since it is no longer needed for validating binary artifacts prior to release. [[GH-1882](https://github.com/hashicorp/consul-k8s/pull/1882)] ## 1.0.3 (January 30, 2023)