From 61f34ad9a3a2fcd0843ebeca259b15376f0b7999 Mon Sep 17 00:00:00 2001
From: cpanato <ctadeu@gmail.com>
Date: Wed, 28 Aug 2024 16:26:22 +0200
Subject: [PATCH] Bump images, dependencies and versions to go 1.22.6 and
 distroless iptables

Signed-off-by: cpanato <ctadeu@gmail.com>
---
 .go-version                     |  2 +-
 build/build-image/cross/VERSION |  2 +-
 build/common.sh                 |  4 +--
 build/dependencies.yaml         |  8 ++---
 staging/publishing/rules.yaml   | 62 ++++++++++++++++-----------------
 test/images/Makefile            |  2 +-
 test/utils/image/manifest.go    |  2 +-
 7 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/.go-version b/.go-version
index 054c858fbf36c..e81ed8be40988 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.22.5
\ No newline at end of file
+1.22.6
\ No newline at end of file
diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION
index 6f5183bc3f703..b111c98e51499 100644
--- a/build/build-image/cross/VERSION
+++ b/build/build-image/cross/VERSION
@@ -1 +1 @@
-v1.28.0-go1.22.5-bullseye.0
+v1.28.0-go1.22.6-bullseye.0
diff --git a/build/common.sh b/build/common.sh
index cf5906e34aedb..24b14bc1e5bad 100755
--- a/build/common.sh
+++ b/build/common.sh
@@ -96,8 +96,8 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}"
 readonly KUBE_CONTAINER_RSYNC_PORT=8730
 
 # These are the default versions (image tags) for their respective base images.
-readonly __default_distroless_iptables_version=v0.5.6
-readonly __default_go_runner_version=v2.3.1-go1.22.5-bookworm.0
+readonly __default_distroless_iptables_version=v0.5.7
+readonly __default_go_runner_version=v2.3.1-go1.22.6-bookworm.0
 readonly __default_setcap_version=bookworm-v1.0.3
 
 # These are the base images for the Docker-wrapped binaries.
diff --git a/build/dependencies.yaml b/build/dependencies.yaml
index 95bd10b7b1795..9e3ab2d6d3fe5 100644
--- a/build/dependencies.yaml
+++ b/build/dependencies.yaml
@@ -114,7 +114,7 @@ dependencies:
 
   # Golang
   - name: "golang: upstream version"
-    version: 1.22.5
+    version: 1.22.6
     refPaths:
     - path: .go-version
     - path: build/build-image/cross/VERSION
@@ -137,7 +137,7 @@ dependencies:
     #   match: minimum_go_version=go([0-9]+\.[0-9]+)
 
   - name: "registry.k8s.io/kube-cross: dependents"
-    version: v1.28.0-go1.22.5-bullseye.0
+    version: v1.28.0-go1.22.6-bullseye.0
     refPaths:
     - path: build/build-image/cross/VERSION
 
@@ -159,7 +159,7 @@ dependencies:
       match: BASE_IMAGE_VERSION\?=
 
   - name: "registry.k8s.io/distroless-iptables: dependents"
-    version: v0.5.6
+    version: v0.5.7
     refPaths:
     - path: build/common.sh
       match: __default_distroless_iptables_version=
@@ -167,7 +167,7 @@ dependencies:
       match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"}
 
   - name: "registry.k8s.io/go-runner: dependents"
-    version: v2.3.1-go1.22.5-bookworm.0
+    version: v2.3.1-go1.22.6-bookworm.0
     refPaths:
     - path: build/common.sh
       match: __default_go_runner_version=
diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml
index cace51ba5fc8e..c8851ed73976a 100644
--- a/staging/publishing/rules.yaml
+++ b/staging/publishing/rules.yaml
@@ -26,7 +26,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/code-generator
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     source:
       branch: release-1.28
       dir: staging/src/k8s.io/code-generator
@@ -57,7 +57,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/apimachinery
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     source:
       branch: release-1.28
       dir: staging/src/k8s.io/apimachinery
@@ -104,7 +104,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/api
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: apimachinery
       branch: release-1.28
@@ -184,7 +184,7 @@ rules:
       go build -mod=mod ./...
       go test -mod=mod ./...
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: apimachinery
       branch: release-1.28
@@ -260,7 +260,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/component-base
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: apimachinery
       branch: release-1.28
@@ -334,7 +334,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/component-helpers
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: apimachinery
       branch: release-1.28
@@ -377,7 +377,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/kms
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: apimachinery
       branch: release-1.28
@@ -467,7 +467,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/apiserver
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: apimachinery
       branch: release-1.28
@@ -581,7 +581,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/kube-aggregator
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: apimachinery
       branch: release-1.28
@@ -723,7 +723,7 @@ rules:
       # assumes GO111MODULE=on
       go build -mod=mod .
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: apimachinery
       branch: release-1.28
@@ -844,7 +844,7 @@ rules:
       # assumes GO111MODULE=on
       go build -mod=mod .
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: apimachinery
       branch: release-1.28
@@ -970,7 +970,7 @@ rules:
     required-packages:
     - k8s.io/code-generator
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: apimachinery
       branch: release-1.28
@@ -1063,7 +1063,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/metrics
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: apimachinery
       branch: release-1.28
@@ -1139,7 +1139,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/cli-runtime
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: api
       branch: release-1.28
@@ -1223,7 +1223,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/sample-cli-plugin
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: api
       branch: release-1.28
@@ -1308,7 +1308,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/kube-proxy
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: apimachinery
       branch: release-1.28
@@ -1349,7 +1349,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/cri-api
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     source:
       branch: release-1.28
       dir: staging/src/k8s.io/cri-api
@@ -1432,7 +1432,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/kubelet
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: apimachinery
       branch: release-1.28
@@ -1524,7 +1524,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/kube-scheduler
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: apimachinery
       branch: release-1.28
@@ -1626,7 +1626,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/controller-manager
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: api
       branch: release-1.28
@@ -1752,7 +1752,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/cloud-provider
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: api
       branch: release-1.28
@@ -1892,7 +1892,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/kube-controller-manager
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: apimachinery
       branch: release-1.28
@@ -1968,7 +1968,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/cluster-bootstrap
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: apimachinery
       branch: release-1.28
@@ -2030,7 +2030,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/csi-translation-lib
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: api
       branch: release-1.28
@@ -2067,7 +2067,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/mount-utils
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     source:
       branch: release-1.28
       dir: staging/src/k8s.io/mount-utils
@@ -2202,7 +2202,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/legacy-cloud-providers
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: api
       branch: release-1.28
@@ -2338,7 +2338,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/kubectl
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: api
       branch: release-1.28
@@ -2448,7 +2448,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/pod-security-admission
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: api
       branch: release-1.28
@@ -2520,7 +2520,7 @@ rules:
       branch: release-1.27
       dir: staging/src/k8s.io/dynamic-resource-allocation
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: apimachinery
       branch: release-1.28
@@ -2555,7 +2555,7 @@ rules:
       branch: master
       dir: staging/src/k8s.io/endpointslice
   - name: release-1.28
-    go: 1.22.5
+    go: 1.22.6
     dependencies:
     - repository: api
       branch: release-1.28
@@ -2570,4 +2570,4 @@ rules:
       dir: staging/src/k8s.io/endpointslice
 recursive-delete-patterns:
 - '*/.gitattributes'
-default-go-version: 1.22.5
+default-go-version: 1.22.6
diff --git a/test/images/Makefile b/test/images/Makefile
index 56bbb67fd6395..fafeab57db1c7 100644
--- a/test/images/Makefile
+++ b/test/images/Makefile
@@ -16,7 +16,7 @@ REGISTRY ?= registry.k8s.io/e2e-test-images
 GOARM ?= 7
 DOCKER_CERT_BASE_PATH ?=
 QEMUVERSION=v5.1.0-2
-GOLANG_VERSION=1.22.5
+GOLANG_VERSION=1.22.6
 export
 
 ifndef WHAT
diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go
index 3d51bd5f99932..4125347dc220e 100644
--- a/test/utils/image/manifest.go
+++ b/test/utils/image/manifest.go
@@ -241,7 +241,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
 	configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.29-4"}
 	configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}
 	configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.3"}
-	configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.6"}
+	configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.7"}
 	configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.12-0"}
 	configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
 	configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}
