From a6f01f36a8ac775539f47bf5036d420e50228814 Mon Sep 17 00:00:00 2001 From: David Yu Date: Tue, 15 Nov 2022 16:27:03 -0800 Subject: [PATCH 1/7] bump up ubi-minimal image to 8.7 --- control-plane/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control-plane/Dockerfile b/control-plane/Dockerfile index 33e42966bb..42b479c814 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 a972bd7b4ad33bfc0f2e4ba082e0cbd6ff885861 Mon Sep 17 00:00:00 2001 From: David Yu Date: Tue, 15 Nov 2022 16:31:11 -0800 Subject: [PATCH 2/7] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd65df263e..0174868eff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ IMPROVEMENTS: * Update minimum go version for project to 1.19 [[GH-1633](https://github.com/hashicorp/consul-k8s/pull/1633)] * Remove unneeded `agent:read` ACL permissions from mesh gateway policy. [[GH-1255](https://github.com/hashicorp/consul-k8s/pull/1255)] * Support updating health checks on consul clients during an upgrade to agentless. [[GH-1690](https://github.com/hashicorp/consul-k8s/pull/1690)] + * Update ubi-minimal based image to `ubi-minimal:8.7`. [[GH-1725][https://github.com/hashicorp/consul-k8s/pull/1725]] * Helm: * Remove deprecated annotation `service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"` in the `server-service` template. [[GH-1619](https://github.com/hashicorp/consul-k8s/pull/1619)] * Support `minAvailable` on connect injector `PodDisruptionBudget`. [[GH-1557](https://github.com/hashicorp/consul-k8s/pull/1557)] From 2aaf26706b2d2873bd63ee4dbcdcf7d2ebbb8e9a Mon Sep 17 00:00:00 2001 From: David Yu Date: Tue, 15 Nov 2022 16:37:31 -0800 Subject: [PATCH 3/7] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0174868eff..4559f551a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,7 +37,7 @@ IMPROVEMENTS: * Update minimum go version for project to 1.19 [[GH-1633](https://github.com/hashicorp/consul-k8s/pull/1633)] * Remove unneeded `agent:read` ACL permissions from mesh gateway policy. [[GH-1255](https://github.com/hashicorp/consul-k8s/pull/1255)] * Support updating health checks on consul clients during an upgrade to agentless. [[GH-1690](https://github.com/hashicorp/consul-k8s/pull/1690)] - * Update ubi-minimal based image to `ubi-minimal:8.7`. [[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:8.7`. [[GH-1725][https://github.com/hashicorp/consul-k8s/pull/1725]] * Helm: * Remove deprecated annotation `service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"` in the `server-service` template. [[GH-1619](https://github.com/hashicorp/consul-k8s/pull/1619)] * Support `minAvailable` on connect injector `PodDisruptionBudget`. [[GH-1557](https://github.com/hashicorp/consul-k8s/pull/1557)] From 2836c585c7bbe3271f3098c482b1d3b631321793 Mon Sep 17 00:00:00 2001 From: David Yu Date: Tue, 15 Nov 2022 16:50:55 -0800 Subject: [PATCH 4/7] Update CHANGELOG.md Co-authored-by: Iryna Shustava --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4559f551a6..b177634760 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,7 +37,7 @@ IMPROVEMENTS: * Update minimum go version for project to 1.19 [[GH-1633](https://github.com/hashicorp/consul-k8s/pull/1633)] * Remove unneeded `agent:read` ACL permissions from mesh gateway policy. [[GH-1255](https://github.com/hashicorp/consul-k8s/pull/1255)] * Support updating health checks on consul clients during an upgrade to agentless. [[GH-1690](https://github.com/hashicorp/consul-k8s/pull/1690)] - * Bump Dockerfile base image for RedHat UBI `consul-k8s-control-plane` image to `ubi-minimal:8.7`. [[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:8.7`. [[GH-1725][https://github.com/hashicorp/consul-k8s/pull/1725]] * Helm: * Remove deprecated annotation `service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"` in the `server-service` template. [[GH-1619](https://github.com/hashicorp/consul-k8s/pull/1619)] * Support `minAvailable` on connect injector `PodDisruptionBudget`. [[GH-1557](https://github.com/hashicorp/consul-k8s/pull/1557)] From fc8fc6622aaa1f551b3f04d65e7c5641613fc931 Mon Sep 17 00:00:00 2001 From: David Yu Date: Wed, 16 Nov 2022 09:51:06 -0800 Subject: [PATCH 5/7] bump --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b177634760..404e5425c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,7 +37,7 @@ IMPROVEMENTS: * Update minimum go version for project to 1.19 [[GH-1633](https://github.com/hashicorp/consul-k8s/pull/1633)] * Remove unneeded `agent:read` ACL permissions from mesh gateway policy. [[GH-1255](https://github.com/hashicorp/consul-k8s/pull/1255)] * Support updating health checks on consul clients during an upgrade to agentless. [[GH-1690](https://github.com/hashicorp/consul-k8s/pull/1690)] - * Bump Dockerfile base image for RedHat UBI `consul-k8s-control-plane` image to `ubi-minimal:8.7`. [[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]] * Helm: * Remove deprecated annotation `service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"` in the `server-service` template. [[GH-1619](https://github.com/hashicorp/consul-k8s/pull/1619)] * Support `minAvailable` on connect injector `PodDisruptionBudget`. [[GH-1557](https://github.com/hashicorp/consul-k8s/pull/1557)] From 934d4b0f852aaa1e4bd589be3fad0c2a8a7d5155 Mon Sep 17 00:00:00 2001 From: David Yu Date: Wed, 16 Nov 2022 09:51:49 -0800 Subject: [PATCH 6/7] Update Dockerfile --- control-plane/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control-plane/Dockerfile b/control-plane/Dockerfile index 42b479c814..20357c152a 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/ubi8/ubi-minimal:9.1 as ubi ARG PRODUCT_NAME ARG PRODUCT_VERSION From b52f5faeb760f9fdb0a03ed8f8b1bcf260bca16b Mon Sep 17 00:00:00 2001 From: David Yu Date: Wed, 16 Nov 2022 09:57:51 -0800 Subject: [PATCH 7/7] typo on url --- control-plane/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control-plane/Dockerfile b/control-plane/Dockerfile index 20357c152a..9ac4188c22 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:9.1 as ubi +FROM registry.access.redhat.com/ubi9-minimal:9.1.0 as ubi ARG PRODUCT_NAME ARG PRODUCT_VERSION