Skip to content

Commit bdcca61

Browse files
upgrade go to 1.23.10 and update integration test to include consul 1.21 (#759)
* add consul 1.21.0 to intergration tests * upgrade go to 1.23.10 * added changelog for #759 * removed unsupported consul version from integ tests
1 parent 6bf34c9 commit bdcca61

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

.changelog/759.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:security
2+
security: upgraded go version to 1.23.10
3+
```

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
needs:
7272
- get-go-version
7373
- get-product-version
74-
runs-on: ubuntu-20.04 # the GLIBC is too high on 22.04
74+
runs-on: ubuntu-22.04
7575
strategy:
7676
matrix:
7777
include:
@@ -341,14 +341,14 @@ jobs:
341341
strategy:
342342
matrix:
343343
server:
344-
- version: v1.15.0-dev
345-
image: hashicorppreview/consul:1.15-dev
346344
- version: v1.18.0-dev
347345
image: hashicorppreview/consul:1.18-dev
348346
- version: v1.19.0-dev
349347
image: hashicorppreview/consul:1.19-dev
350348
- version: v1.20.0-dev
351349
image: hashicorppreview/consul:1.20-dev
350+
- version: v1.21.0-dev
351+
image: hashicorppreview/consul:1.21-dev
352352
dataplane:
353353
- image_suffix: ""
354354
docker_target: "release-default"

.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.23.6
1+
1.23.10

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ ENTRYPOINT ["/usr/local/bin/dumb-init", "/usr/local/bin/consul-dataplane"]
127127
# This image is based on the Red Hat UBI base image, and has the necessary
128128
# labels, license file, and non-root user.
129129
# -----------------------------------
130-
FROM registry.access.redhat.com/ubi9-minimal:9.4 as release-ubi
130+
FROM registry.access.redhat.com/ubi9-minimal:9.6 as release-ubi
131131

132132
ARG BIN_NAME=consul-dataplane
133133
ENV BIN_NAME=$BIN_NAME
@@ -169,7 +169,7 @@ ENTRYPOINT ["/usr/local/bin/dumb-init", "/usr/local/bin/consul-dataplane"]
169169
# This image is based on the Red Hat UBI base image, and has the necessary
170170
# labels, license file, and non-root user.
171171
# -----------------------------------
172-
FROM registry.access.redhat.com/ubi9-minimal:9.4 as release-fips-ubi
172+
FROM registry.access.redhat.com/ubi9-minimal:9.6 as release-fips-ubi
173173

174174
ARG BIN_NAME
175175
ENV BIN_NAME=$BIN_NAME

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/hashicorp/consul-dataplane
22

3-
go 1.23.6
3+
go 1.23.10
44

55
require (
66
dario.cat/mergo v1.0.0

0 commit comments

Comments
 (0)