From bd2044f8e8ec363b7ded68ef57489d2f34ef2b76 Mon Sep 17 00:00:00 2001 From: temp Date: Mon, 6 Feb 2023 23:02:33 -0500 Subject: [PATCH 1/2] no-op commit due to failed cherry-picking From 56c2d885c0f29098c3e83f60b24d07b2f87a407f Mon Sep 17 00:00:00 2001 From: David Yu Date: Mon, 6 Feb 2023 18:00:55 -0800 Subject: [PATCH 2/2] manual backport --- CHANGELOG.md | 2 +- control-plane/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6e029d6f2..43a9491879 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)] ## 0.49.3 (January 30, 2023) diff --git a/control-plane/Dockerfile b/control-plane/Dockerfile index f2b78fc8e0..5a418b5bf4 100644 --- a/control-plane/Dockerfile +++ b/control-plane/Dockerfile @@ -37,7 +37,7 @@ LABEL name=${BIN_NAME} \ ENV BIN_NAME=${BIN_NAME} ENV VERSION=${VERSION} -RUN apk add --no-cache ca-certificates curl gnupg libcap openssl su-exec iputils libc6-compat iptables +RUN apk add --no-cache ca-certificates curl libcap openssl su-exec iputils libc6-compat iptables # Create a non-root user to run the software. RUN addgroup ${BIN_NAME} && \