From be76af2360898f80e8d2d16f5cfbafbc78065bd1 Mon Sep 17 00:00:00 2001 From: Dhia Ayachi Date: Tue, 17 Sep 2024 13:17:01 +0000 Subject: [PATCH 1/3] backport of commit 888e302f6e87f27d0c8a0c6facfd6c3a6c8033c5 --- Dockerfile | 2 +- go.mod | 4 ++-- test-integ/go.mod | 4 ++-- test/integration/consul-container/go.mod | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 55e5972bd9e5..dc617c5e0492 100644 --- a/Dockerfile +++ b/Dockerfile @@ -203,7 +203,7 @@ CMD ["agent", "-dev", "-client", "0.0.0.0"] # Red Hat UBI-based image # This target is used to build a Consul image for use on OpenShift. -FROM registry.access.redhat.com/ubi9-minimal:9.3 as ubi +FROM registry.access.redhat.com/ubi9-minimal:9.4 as ubi ARG PRODUCT_VERSION ARG PRODUCT_REVISION diff --git a/go.mod b/go.mod index debde423e654..30823f8f4ab2 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/hashicorp/consul -go 1.22 +go 1.23 -toolchain go1.22.5 +toolchain go1.23.1 replace ( github.com/hashicorp/consul/api => ./api diff --git a/test-integ/go.mod b/test-integ/go.mod index 7a91a5a20e5c..6dacdff4d378 100644 --- a/test-integ/go.mod +++ b/test-integ/go.mod @@ -1,8 +1,8 @@ module github.com/hashicorp/consul/test-integ -go 1.22 +go 1.23 -toolchain go1.22.5 +toolchain go1.23.1 require ( github.com/google/go-cmp v0.5.9 diff --git a/test/integration/consul-container/go.mod b/test/integration/consul-container/go.mod index ce7a61ef253f..d9916a720c3f 100644 --- a/test/integration/consul-container/go.mod +++ b/test/integration/consul-container/go.mod @@ -1,8 +1,8 @@ module github.com/hashicorp/consul/test/integration/consul-container -go 1.22 +go 1.23 -toolchain go1.22.5 +toolchain go1.23.1 require ( fortio.org/fortio v1.54.0 From e5ad93bfe41b2fb39c3a00ceb9ffafa8ef933c5b Mon Sep 17 00:00:00 2001 From: Dhia Ayachi Date: Tue, 17 Sep 2024 13:28:46 +0000 Subject: [PATCH 2/3] backport of commit 17499dc4dcca4aa6f67b3f95bd24b433cd32556b --- .changelog/21750.txt | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changelog/21750.txt diff --git a/.changelog/21750.txt b/.changelog/21750.txt new file mode 100644 index 000000000000..37dd26c2982b --- /dev/null +++ b/.changelog/21750.txt @@ -0,0 +1,7 @@ +```release-note:enhancement +security: upgrade go version to 1.23.1 +``` + +```release-note:enhancement +security: upgrade ubi base image to 9.4 +``` From 3b62776a0ad8b9a31ce68b0f7ba7d62425915681 Mon Sep 17 00:00:00 2001 From: Dhia Ayachi Date: Tue, 17 Sep 2024 14:36:22 +0000 Subject: [PATCH 3/3] backport of commit d933d3727d1ddf4566d0ee7612e3a64029034314 --- .changelog/21750.txt | 4 ---- go.mod | 4 ++-- test-integ/go.mod | 4 ++-- test/integration/consul-container/go.mod | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.changelog/21750.txt b/.changelog/21750.txt index 37dd26c2982b..c30c08179b4b 100644 --- a/.changelog/21750.txt +++ b/.changelog/21750.txt @@ -1,7 +1,3 @@ -```release-note:enhancement -security: upgrade go version to 1.23.1 -``` - ```release-note:enhancement security: upgrade ubi base image to 9.4 ``` diff --git a/go.mod b/go.mod index 30823f8f4ab2..debde423e654 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/hashicorp/consul -go 1.23 +go 1.22 -toolchain go1.23.1 +toolchain go1.22.5 replace ( github.com/hashicorp/consul/api => ./api diff --git a/test-integ/go.mod b/test-integ/go.mod index 6dacdff4d378..7a91a5a20e5c 100644 --- a/test-integ/go.mod +++ b/test-integ/go.mod @@ -1,8 +1,8 @@ module github.com/hashicorp/consul/test-integ -go 1.23 +go 1.22 -toolchain go1.23.1 +toolchain go1.22.5 require ( github.com/google/go-cmp v0.5.9 diff --git a/test/integration/consul-container/go.mod b/test/integration/consul-container/go.mod index d9916a720c3f..ce7a61ef253f 100644 --- a/test/integration/consul-container/go.mod +++ b/test/integration/consul-container/go.mod @@ -1,8 +1,8 @@ module github.com/hashicorp/consul/test/integration/consul-container -go 1.23 +go 1.22 -toolchain go1.23.1 +toolchain go1.22.5 require ( fortio.org/fortio v1.54.0