github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-20 09:05:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #122201 from xmudrii/go1.21.5-1.20.12

Browse Source 
[go] Bump images, dependencies and versions to go 1.21.5
This commit is contained in:
Kubernetes Prow Robot 2023-12-06 15:37:07 +01:00 committed by GitHub
commit 9e028b40b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.go-version
View File

@ -1 +1 @@
1.21.4 1.21.5

2
build/build-image/cross/VERSION
View File

@ -1 +1 @@
v1.29.0-go1.21.4-bullseye.0 v1.29.0-go1.21.5-bullseye.0

2
build/common.sh
View File

@ -97,7 +97,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
# These are the default versions (image tags) for their respective base images. # These are the default versions (image tags) for their respective base images.
readonly __default_distroless_iptables_version=v0.4.2 readonly __default_distroless_iptables_version=v0.4.2
readonly __default_go_runner_version=v2.3.1-go1.21.4-bookworm.0 readonly __default_go_runner_version=v2.3.1-go1.21.5-bookworm.0
readonly __default_setcap_version=bookworm-v1.0.0 readonly __default_setcap_version=bookworm-v1.0.0
# These are the base images for the Docker-wrapped binaries. # These are the base images for the Docker-wrapped binaries.

6
build/dependencies.yaml
View File

@ -118,7 +118,7 @@ dependencies:
# Golang # Golang
- name: "golang: upstream version" - name: "golang: upstream version"
version: 1.21.4 version: 1.21.5
refPaths: refPaths:
- path: .go-version - path: .go-version
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
@ -140,7 +140,7 @@ dependencies:
match: minimum_go_version=go([0-9]+\.[0-9]+) match: minimum_go_version=go([0-9]+\.[0-9]+)
- name: "registry.k8s.io/kube-cross: dependents" - name: "registry.k8s.io/kube-cross: dependents"
version: v1.29.0-go1.21.4-bullseye.0 version: v1.29.0-go1.21.5-bullseye.0
refPaths: refPaths:
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
@ -186,7 +186,7 @@ dependencies:
match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"} match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"}
- name: "registry.k8s.io/go-runner: dependents" - name: "registry.k8s.io/go-runner: dependents"
version: v2.3.1-go1.21.4-bookworm.0 version: v2.3.1-go1.21.5-bookworm.0
refPaths: refPaths:
- path: build/common.sh - path: build/common.sh
match: __default_go_runner_version= match: __default_go_runner_version=

62
staging/publishing/rules.yaml
View File

@ -31,7 +31,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/code-generator - staging/src/k8s.io/code-generator
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
source: source:
branch: release-1.29 branch: release-1.29
dirs: dirs:
@ -68,7 +68,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/apimachinery - staging/src/k8s.io/apimachinery
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
source: source:
branch: release-1.29 branch: release-1.29
dirs: dirs:
@ -121,7 +121,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/api - staging/src/k8s.io/api
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.29 branch: release-1.29
@ -207,7 +207,7 @@ rules:
go build -mod=mod ./... go build -mod=mod ./...
go test -mod=mod ./... go test -mod=mod ./...
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.29 branch: release-1.29
@ -289,7 +289,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/component-base - staging/src/k8s.io/component-base
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.29 branch: release-1.29
@ -369,7 +369,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/component-helpers - staging/src/k8s.io/component-helpers
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.29 branch: release-1.29
@ -425,7 +425,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/kms - staging/src/k8s.io/kms
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.29 branch: release-1.29
@ -519,7 +519,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/apiserver - staging/src/k8s.io/apiserver
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.29 branch: release-1.29
@ -641,7 +641,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/kube-aggregator - staging/src/k8s.io/kube-aggregator
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.29 branch: release-1.29
@ -791,7 +791,7 @@ rules:
# assumes GO111MODULE=on # assumes GO111MODULE=on
go build -mod=mod . go build -mod=mod .
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.29 branch: release-1.29
@ -918,7 +918,7 @@ rules:
# assumes GO111MODULE=on # assumes GO111MODULE=on
go build -mod=mod . go build -mod=mod .
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.29 branch: release-1.29
@ -1052,7 +1052,7 @@ rules:
required-packages: required-packages:
- k8s.io/code-generator - k8s.io/code-generator
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.29 branch: release-1.29
@ -1151,7 +1151,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/metrics - staging/src/k8s.io/metrics
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.29 branch: release-1.29
@ -1233,7 +1233,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/cli-runtime - staging/src/k8s.io/cli-runtime
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: api - repository: api
branch: release-1.29 branch: release-1.29
@ -1323,7 +1323,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/sample-cli-plugin - staging/src/k8s.io/sample-cli-plugin
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: api - repository: api
branch: release-1.29 branch: release-1.29
@ -1414,7 +1414,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/kube-proxy - staging/src/k8s.io/kube-proxy
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.29 branch: release-1.29
@ -1461,7 +1461,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/cri-api - staging/src/k8s.io/cri-api
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
source: source:
branch: release-1.29 branch: release-1.29
dirs: dirs:
@ -1556,7 +1556,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/kubelet - staging/src/k8s.io/kubelet
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.29 branch: release-1.29
@ -1654,7 +1654,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/kube-scheduler - staging/src/k8s.io/kube-scheduler
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.29 branch: release-1.29
@ -1764,7 +1764,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/controller-manager - staging/src/k8s.io/controller-manager
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: api - repository: api
branch: release-1.29 branch: release-1.29
@ -1898,7 +1898,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/cloud-provider - staging/src/k8s.io/cloud-provider
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: api - repository: api
branch: release-1.29 branch: release-1.29
@ -2046,7 +2046,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/kube-controller-manager - staging/src/k8s.io/kube-controller-manager
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.29 branch: release-1.29
@ -2128,7 +2128,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/cluster-bootstrap - staging/src/k8s.io/cluster-bootstrap
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.29 branch: release-1.29
@ -2196,7 +2196,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/csi-translation-lib - staging/src/k8s.io/csi-translation-lib
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: api - repository: api
branch: release-1.29 branch: release-1.29
@ -2239,7 +2239,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/mount-utils - staging/src/k8s.io/mount-utils
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
source: source:
branch: release-1.29 branch: release-1.29
dirs: dirs:
@ -2378,7 +2378,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/legacy-cloud-providers - staging/src/k8s.io/legacy-cloud-providers
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: api - repository: api
branch: release-1.29 branch: release-1.29
@ -2520,7 +2520,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/kubectl - staging/src/k8s.io/kubectl
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: api - repository: api
branch: release-1.29 branch: release-1.29
@ -2638,7 +2638,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/pod-security-admission - staging/src/k8s.io/pod-security-admission
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: api - repository: api
branch: release-1.29 branch: release-1.29
@ -2735,7 +2735,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/dynamic-resource-allocation - staging/src/k8s.io/dynamic-resource-allocation
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: apimachinery - repository: apimachinery
branch: release-1.29 branch: release-1.29
@ -2787,7 +2787,7 @@ rules:
dirs: dirs:
- staging/src/k8s.io/endpointslice - staging/src/k8s.io/endpointslice
- name: release-1.29 - name: release-1.29
go: 1.21.4 go: 1.21.5
dependencies: dependencies:
- repository: api - repository: api
branch: release-1.29 branch: release-1.29
@ -2803,4 +2803,4 @@ rules:
- staging/src/k8s.io/endpointslice - staging/src/k8s.io/endpointslice
recursive-delete-patterns: recursive-delete-patterns:
- '*/.gitattributes' - '*/.gitattributes'
default-go-version: 1.21.4 default-go-version: 1.21.5

2
test/images/Makefile
View File

@ -16,7 +16,7 @@ REGISTRY ?= registry.k8s.io/e2e-test-images
GOARM ?= 7 GOARM ?= 7
DOCKER_CERT_BASE_PATH ?= DOCKER_CERT_BASE_PATH ?=
QEMUVERSION=v5.1.0-2 QEMUVERSION=v5.1.0-2
GOLANG_VERSION=1.21.4 GOLANG_VERSION=1.21.5
export export
ifndef WHAT ifndef WHAT