diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f6069ddf4..10abb69630 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,11 +15,11 @@ on: - prep-v[1-9].* env: - BUILDTIME_BASE: "golang:1.21.7-alpine3.18" + BUILDTIME_BASE: "golang:1.22.3-alpine3.18" # Do not bump past Alpine 3.18 until upstream netfilter problems in iptables v1.8.10 are resolved. See: # https://github.com/cloudnativelabs/kube-router/issues/1676 RUNTIME_BASE: "alpine:3.18" - GO_VERSION: "~1.21.7" + GO_VERSION: "~1.22.3" GO_CACHE: "/home/runner/.cache/go-build" GO_MOD_CACHE: "/home/runner/go/pkg/mod" diff --git a/Makefile b/Makefile index 528f35f92d..315f26a348 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ DOCKER=$(if $(or $(IN_DOCKER_GROUP),$(IS_ROOT),$(OSX)),docker,sudo docker) MAKEFILE_DIR=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) UPSTREAM_IMPORT_PATH=$(GOPATH)/src/github.com/cloudnativelabs/kube-router/ BUILD_IN_DOCKER?=true -DOCKER_BUILD_IMAGE?=golang:1.21.7-alpine3.18 +DOCKER_BUILD_IMAGE?=golang:1.22.3-alpine3.18 ## These variables are used by the Dockerfile as the bases for building and creating the runtime container ## During CI these come from .github/workflows/ci.yaml below we define for local builds as well GO_CACHE?=$(shell go env GOCACHE) diff --git a/go.mod b/go.mod index 1d9b775c6e..6ee26b773e 100644 --- a/go.mod +++ b/go.mod @@ -114,4 +114,4 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) -go 1.21 +go 1.22