diff --git a/.go-version b/.go-version index 24b38a95969..8864ad2970d 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22.1 \ No newline at end of file +1.22.2 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 633fe53b839..ac88f5a4168 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.30.0-go1.22.1-bullseye.0 +v1.30.0-go1.22.2-bullseye.0 diff --git a/build/common.sh b/build/common.sh index f4cefaf504e..b0a75835d72 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.2 -readonly __default_go_runner_version=v2.3.1-go1.22.1-bookworm.0 +readonly __default_distroless_iptables_version=v0.5.3 +readonly __default_go_runner_version=v2.3.1-go1.22.2-bookworm.0 readonly __default_setcap_version=bookworm-v1.0.2 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 1afa29dcde3..06222a35548 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -116,7 +116,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.22.1 + version: 1.22.2 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.1-bullseye.0 + version: v1.30.0-go1.22.2-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.2 + version: v0.5.3 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.1-bookworm.0 + version: v2.3.1-go1.22.2-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 6a54594bb91..83d84ac0e35 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -31,7 +31,7 @@ rules: dirs: - staging/src/k8s.io/apimachinery - name: release-1.30 - go: 1.22.1 + go: 1.22.2 source: branch: release-1.30 dirs: @@ -84,7 +84,7 @@ rules: dirs: - staging/src/k8s.io/api - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: apimachinery branch: release-1.30 @@ -170,7 +170,7 @@ rules: go build -mod=mod ./... go test -mod=mod ./... - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: apimachinery branch: release-1.30 @@ -220,7 +220,7 @@ rules: dirs: - staging/src/k8s.io/code-generator - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: apimachinery branch: release-1.30 @@ -295,7 +295,7 @@ rules: dirs: - staging/src/k8s.io/component-base - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: apimachinery branch: release-1.30 @@ -375,7 +375,7 @@ rules: dirs: - staging/src/k8s.io/component-helpers - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: apimachinery branch: release-1.30 @@ -440,7 +440,7 @@ rules: dirs: - staging/src/k8s.io/kms - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: apimachinery branch: release-1.30 @@ -536,7 +536,7 @@ rules: dirs: - staging/src/k8s.io/apiserver - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: apimachinery branch: release-1.30 @@ -660,7 +660,7 @@ rules: dirs: - staging/src/k8s.io/kube-aggregator - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: apimachinery branch: release-1.30 @@ -812,7 +812,7 @@ rules: # assumes GO111MODULE=on go build -mod=mod . - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: apimachinery branch: release-1.30 @@ -939,7 +939,7 @@ rules: # assumes GO111MODULE=on go build -mod=mod . - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: apimachinery branch: release-1.30 @@ -1075,7 +1075,7 @@ rules: required-packages: - k8s.io/code-generator - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: apimachinery branch: release-1.30 @@ -1174,7 +1174,7 @@ rules: dirs: - staging/src/k8s.io/metrics - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: apimachinery branch: release-1.30 @@ -1256,7 +1256,7 @@ rules: dirs: - staging/src/k8s.io/cli-runtime - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: api branch: release-1.30 @@ -1346,7 +1346,7 @@ rules: dirs: - staging/src/k8s.io/sample-cli-plugin - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: api branch: release-1.30 @@ -1437,7 +1437,7 @@ rules: dirs: - staging/src/k8s.io/kube-proxy - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: apimachinery branch: release-1.30 @@ -1484,7 +1484,7 @@ rules: dirs: - staging/src/k8s.io/cri-api - name: release-1.30 - go: 1.22.1 + go: 1.22.2 source: branch: release-1.30 dirs: @@ -1585,7 +1585,7 @@ rules: dirs: - staging/src/k8s.io/kubelet - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: apimachinery branch: release-1.30 @@ -1683,7 +1683,7 @@ rules: dirs: - staging/src/k8s.io/kube-scheduler - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: apimachinery branch: release-1.30 @@ -1795,7 +1795,7 @@ rules: dirs: - staging/src/k8s.io/controller-manager - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: api branch: release-1.30 @@ -1931,7 +1931,7 @@ rules: dirs: - staging/src/k8s.io/cloud-provider - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: api branch: release-1.30 @@ -2081,7 +2081,7 @@ rules: dirs: - staging/src/k8s.io/kube-controller-manager - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: apimachinery branch: release-1.30 @@ -2163,7 +2163,7 @@ rules: dirs: - staging/src/k8s.io/cluster-bootstrap - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: apimachinery branch: release-1.30 @@ -2231,7 +2231,7 @@ rules: dirs: - staging/src/k8s.io/csi-translation-lib - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: api branch: release-1.30 @@ -2274,7 +2274,7 @@ rules: dirs: - staging/src/k8s.io/mount-utils - name: release-1.30 - go: 1.22.1 + go: 1.22.2 source: branch: release-1.30 dirs: @@ -2411,7 +2411,7 @@ rules: dirs: - staging/src/k8s.io/legacy-cloud-providers - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: api branch: release-1.30 @@ -2553,7 +2553,7 @@ rules: dirs: - staging/src/k8s.io/kubectl - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: api branch: release-1.30 @@ -2673,7 +2673,7 @@ rules: dirs: - staging/src/k8s.io/pod-security-admission - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: api branch: release-1.30 @@ -2793,7 +2793,7 @@ rules: dirs: - staging/src/k8s.io/dynamic-resource-allocation - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: apimachinery branch: release-1.30 @@ -2862,7 +2862,7 @@ rules: dirs: - staging/src/k8s.io/endpointslice - name: release-1.30 - go: 1.22.1 + go: 1.22.2 dependencies: - repository: api branch: release-1.30 @@ -2878,4 +2878,4 @@ rules: - staging/src/k8s.io/endpointslice recursive-delete-patterns: - '*/.gitattributes' -default-go-version: 1.22.1 +default-go-version: 1.22.2 diff --git a/test/images/Makefile b/test/images/Makefile index 2eef6c038ba..73fa2bbf5f7 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.1 +GOLANG_VERSION=1.22.2 export ifndef WHAT diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 048f604367f..f9fd06fb4f7 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.2"} + configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.3"} 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"}