Skip to content

Commit

Permalink
Merge pull request #128 from jingyuanliang/bump
Browse files Browse the repository at this point in the history
Bump to Go 1.22 and distroless-iptables:v0.4.4
  • Loading branch information
k8s-ci-robot authored Feb 7, 2024
2 parents b314078 + c692907 commit a8c6a6f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/crossbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
crossbuild:
strategy:
matrix:
go-version: [ "1.19", "1.20", "1.21" ]
go-version: [ "1.20", "1.21", "1.22" ]
platform: [ "ubuntu-latest" ]
runs-on: ${{ matrix.platform }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
test:
strategy:
matrix:
go-version: [ "1.19", "1.20", "1.21" ]
go-version: [ "1.21", "1.22" ]
platform: [ "ubuntu-latest" ]
runs-on: ${{ matrix.platform }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ALL_PLATFORMS ?= linux/amd64 linux/arm linux/arm64 linux/ppc64le linux/s390x

# The "FROM" part of the Dockerfile. This should be a manifest-list which
# supports all of the platforms listed in ALL_PLATFORMS.
BASE_IMAGE ?= registry.k8s.io/build-image/distroless-iptables:v0.3.1
BASE_IMAGE ?= registry.k8s.io/build-image/distroless-iptables:v0.4.4

# Where to push the docker images.
REGISTRY ?= gcr.io/k8s-staging-networking
Expand Down Expand Up @@ -60,7 +60,7 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH))

TAG := $(VERSION)__$(OS)_$(ARCH)

GO_VERSION := 1.21
GO_VERSION := 1.22
BUILD_IMAGE := golang:$(GO_VERSION)-alpine

BIN_EXTENSION :=
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module k8s.io/ip-masq-agent

go 1.21
go 1.22

require (
github.com/golang/glog v1.2.0
Expand Down

0 comments on commit a8c6a6f

Please sign in to comment.