Skip to content

Commit e72701c

Browse files
committed
BUILD/MINOR: update go version to 1.22
1 parent 7292d4c commit e72701c

File tree

6 files changed

+8
-7
lines changed

6 files changed

+8
-7
lines changed

.gitlab-ci.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ variables:
1111
KIND: v0.21.0
1212
DOCKER_HOST: tcp://docker:2375
1313
DOCKER_DRIVER: overlay2
14-
GO_VERSION: "1.21"
15-
DOCKER_VERSION: "24.0"
14+
GO_VERSION: "1.22"
15+
DOCKER_VERSION: "24.0.6"
1616
diff:
1717
stage: diff
1818
rules:
@@ -196,6 +196,7 @@ docker-build:
196196
matrix:
197197
- TEST_PART: ["parallel", "https", "sequential-1", "sequential-2"]
198198
script:
199+
- gotest --version
199200
- CI_ENV=gitlab deploy/tests/create.sh
200201
- kubectl get pods -A
201202
- echo "running make -f Makefile.ci ci-e2e-$TEST_PART tests" && make -f Makefile.ci ci-e2e-$TEST_PART

build/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.21-alpine AS builder
15+
FROM golang:1.22-alpine AS builder
1616

1717
RUN apk --no-cache add git openssh
1818

build/Dockerfile.pebble

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.21-alpine AS builder
15+
FROM golang:1.22-alpine AS builder
1616

1717
RUN apk --no-cache add git openssh
1818

deploy/tests/images/http-echo/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21-alpine AS builder
1+
FROM golang:1.22-alpine AS builder
22

33
COPY *.go /src/
44
COPY go.mod /src/go.mod

deploy/tests/images/http-echo/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module echo-http
22

3-
go 1.21
3+
go 1.22

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/haproxytech/kubernetes-ingress
22

3-
go 1.21
3+
go 1.22
44

55
require (
66
github.com/Masterminds/semver/v3 v3.2.1

0 commit comments

Comments
 (0)