Skip to content

Commit

Permalink
feat(go): update 1.21.7 -> 1.22.3
Browse files Browse the repository at this point in the history
While this isn't the latest version of 1.22 as of the cutting of this
release, it is the latest version that is allowed with Alpine 3.18 which
we still need until the netfilter bugs are fixed.
  • Loading branch information
aauren committed Aug 3, 2024
1 parent 285eb49 commit b1a2fbf
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,4 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)

go 1.21
go 1.22

0 comments on commit b1a2fbf

Please sign in to comment.