Skip to content

Commit

Permalink
Bump to Go 1.22 and distroless-iptables:v0.4.4
Browse files Browse the repository at this point in the history
At the same time, removing GO_VERSION test matrix from GitHub workflows.
We'll have to keep go version in go.mod at the latest, to ensure golang
compatibility support throughout the release lifetime. However this breaks
buildability with older golang images, since Go 1.21.
  • Loading branch information
jingyuanliang committed Feb 7, 2024
1 parent 43428ed commit 11c0ae5
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 23 deletions.
16 changes: 0 additions & 16 deletions .github/workflows/nativebuild.yaml

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ jobs:
test:
strategy:
matrix:
go-version: [ "1.19", "1.20", "1.21" ]
platform: [ "ubuntu-latest" ]
runs-on: ${{ matrix.platform }}
steps:
- name: Checkout code
uses: actions/checkout@v3
- name: Test
run: make -f Makefile.all test GOFLAGS="-v" GO_VERSION=${{ matrix.go-version }}
run: make -f Makefile.all test GOFLAGS="-v"
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.3
BASE_IMAGE ?= registry.k8s.io/build-image/distroless-iptables:v0.4.4

# Where to push the docker images.
REGISTRY ?= gcr.io/gke-release-staging
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 github.com/GoogleCloudPlatform/netd

go 1.20
go 1.22

require (
github.com/containernetworking/plugins v1.3.0
Expand Down
4 changes: 2 additions & 2 deletions scripts/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.3
BASE_IMAGE ?= registry.k8s.io/build-image/distroless-iptables:v0.4.4

# Where to push the docker images.
REGISTRY ?= gcr.io/gke-release-staging
Expand Down Expand Up @@ -70,7 +70,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

0 comments on commit 11c0ae5

Please sign in to comment.