From 382c9bea4b0751c15d518f28dfa87f0077f08355 Mon Sep 17 00:00:00 2001
From: Jingyuan Liang <jingyuanliang@google.com>
Date: Tue, 30 Jan 2024 21:38:23 +0000
Subject: [PATCH] Bump to Go 1.22 and distroless-iptables:v0.4.4

---
 .github/workflows/nativebuild.yaml | 2 +-
 .github/workflows/test.yaml        | 2 +-
 Makefile                           | 4 ++--
 scripts/Makefile                   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/nativebuild.yaml b/.github/workflows/nativebuild.yaml
index 65df60f00..80217c492 100644
--- a/.github/workflows/nativebuild.yaml
+++ b/.github/workflows/nativebuild.yaml
@@ -6,7 +6,7 @@ jobs:
   nativebuild:
     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:
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index c4d22d2c5..39d36fa05 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -6,7 +6,7 @@ jobs:
   test:
     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:
diff --git a/Makefile b/Makefile
index 1dbb32c07..d10eb1b71 100644
--- a/Makefile
+++ b/Makefile
@@ -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
@@ -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 :=
diff --git a/scripts/Makefile b/scripts/Makefile
index b50dddbd0..5d04f5f9a 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -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
@@ -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 :=