diff --git a/.go-version b/.go-version index 80a81c0e7fc2..24b38a95969f 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22.0 \ No newline at end of file +1.22.1 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index adb177d74e21..633fe53b8397 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.30.0-go1.22.0-bullseye.0 +v1.30.0-go1.22.1-bullseye.0 diff --git a/build/common.sh b/build/common.sh index e7921d933530..b9b464e4045a 100755 --- a/build/common.sh +++ b/build/common.sh @@ -97,8 +97,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.1 -readonly __default_go_runner_version=v2.3.1-go1.22.0-bookworm.0 +readonly __default_distroless_iptables_version=v0.5.2 +readonly __default_go_runner_version=v2.3.1-go1.22.1-bookworm.0 readonly __default_setcap_version=bookworm-v1.0.1 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index db436c22361c..20e2caf22e95 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -116,7 +116,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.22.0 + version: 1.22.1 refPaths: - path: .go-version - path: build/build-image/cross/VERSION @@ -138,7 +138,7 @@ dependencies: match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.30.0-go1.22.0-bullseye.0 + version: v1.30.0-go1.22.1-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -176,7 +176,7 @@ dependencies: match: registry\.k8s\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) - name: "registry.k8s.io/distroless-iptables: dependents" - version: v0.5.1 + version: v0.5.2 refPaths: - path: build/common.sh match: __default_distroless_iptables_version= @@ -184,7 +184,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.0-bookworm.0 + version: v2.3.1-go1.22.1-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 68252583fef9..e2da48a5568f 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -2395,4 +2395,4 @@ rules: - staging/src/k8s.io/endpointslice recursive-delete-patterns: - '*/.gitattributes' -default-go-version: 1.22.0 +default-go-version: 1.22.1 diff --git a/test/images/Makefile b/test/images/Makefile index 3ed2e3d6cce0..2eef6c038ba7 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.0 +GOLANG_VERSION=1.22.1 export ifndef WHAT diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 6b2eb4ac45df..048f604367f3 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -237,7 +237,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"} 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.1"} + configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.2"} 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"}