From 7fc9352fcfe569ebfc7bfc8eb8864ab890f86bd6 Mon Sep 17 00:00:00 2001 From: dongyuzhen Date: Mon, 4 Aug 2025 11:48:20 +0800 Subject: [PATCH] adapt go version --- 0006-adapt-go-version.patch | 76 ++++++++++++++++++------------------- kubernetes.spec | 10 ++++- 2 files changed, 47 insertions(+), 39 deletions(-) diff --git a/0006-adapt-go-version.patch b/0006-adapt-go-version.patch index 9445fca..88a5320 100644 --- a/0006-adapt-go-version.patch +++ b/0006-adapt-go-version.patch @@ -20,7 +20,7 @@ index 6e83421e4fd..3d8ac637188 100644 @@ -1 +1 @@ -1.21.6 \ No newline at end of file -+1.21.4 ++1.24.2 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 5d4ae206a18..8ac11054699 100644 @@ -28,7 +28,7 @@ index 5d4ae206a18..8ac11054699 100644 +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.29.0-go1.21.6-bullseye.0 -+v1.29.0-go1.21.4-bullseye.0 ++v1.29.0-go1.24.2-bullseye.0 diff --git a/build/common.sh b/build/common.sh index bd6a01a2074..da083d18ceb 100755 --- a/build/common.sh @@ -38,7 +38,7 @@ index bd6a01a2074..da083d18ceb 100755 # These are the default versions (image tags) for their respective base images. readonly __default_distroless_iptables_version=v0.4.4 -readonly __default_go_runner_version=v2.3.1-go1.21.6-bookworm.0 -+readonly __default_go_runner_version=v2.3.1-go1.21.4-bookworm.0 ++readonly __default_go_runner_version=v2.3.1-go1.24.2-bookworm.0 readonly __default_setcap_version=bookworm-v1.0.0 # These are the base images for the Docker-wrapped binaries. @@ -51,7 +51,7 @@ index 3a17f6b4bf5..9da3bee180a 100644 # Golang - name: "golang: upstream version" - version: 1.21.6 -+ version: 1.21.4 ++ version: 1.24.2 refPaths: - path: .go-version - path: build/build-image/cross/VERSION @@ -60,7 +60,7 @@ index 3a17f6b4bf5..9da3bee180a 100644 - name: "registry.k8s.io/kube-cross: dependents" - version: v1.29.0-go1.21.6-bullseye.0 -+ version: v1.29.0-go1.21.4-bullseye.0 ++ version: v1.29.0-go1.24.2-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -69,7 +69,7 @@ index 3a17f6b4bf5..9da3bee180a 100644 - name: "registry.k8s.io/go-runner: dependents" - version: v2.3.1-go1.21.6-bookworm.0 -+ version: v2.3.1-go1.21.4-bookworm.0 ++ version: v2.3.1-go1.24.2-bookworm.0 refPaths: - path: build/common.sh match: __default_go_runner_version= @@ -82,7 +82,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/code-generator - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 source: branch: release-1.29 dirs: @@ -91,7 +91,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/apimachinery - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 source: branch: release-1.29 dirs: @@ -100,7 +100,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/api - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: apimachinery branch: release-1.29 @@ -109,7 +109,7 @@ index 62071c41ee2..f1dae4f5031 100644 go test -mod=mod ./... - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: apimachinery branch: release-1.29 @@ -118,7 +118,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/component-base - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: apimachinery branch: release-1.29 @@ -127,7 +127,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/component-helpers - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: apimachinery branch: release-1.29 @@ -136,7 +136,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/kms - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: apimachinery branch: release-1.29 @@ -145,7 +145,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/apiserver - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: apimachinery branch: release-1.29 @@ -154,7 +154,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/kube-aggregator - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: apimachinery branch: release-1.29 @@ -163,7 +163,7 @@ index 62071c41ee2..f1dae4f5031 100644 go build -mod=mod . - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: apimachinery branch: release-1.29 @@ -172,7 +172,7 @@ index 62071c41ee2..f1dae4f5031 100644 go build -mod=mod . - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: apimachinery branch: release-1.29 @@ -181,7 +181,7 @@ index 62071c41ee2..f1dae4f5031 100644 - k8s.io/code-generator - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: apimachinery branch: release-1.29 @@ -190,7 +190,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/metrics - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: apimachinery branch: release-1.29 @@ -199,7 +199,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/cli-runtime - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: api branch: release-1.29 @@ -208,7 +208,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/sample-cli-plugin - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: api branch: release-1.29 @@ -217,7 +217,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/kube-proxy - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: apimachinery branch: release-1.29 @@ -226,7 +226,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/cri-api - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 source: branch: release-1.29 dirs: @@ -235,7 +235,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/kubelet - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: apimachinery branch: release-1.29 @@ -244,7 +244,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/kube-scheduler - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: apimachinery branch: release-1.29 @@ -253,7 +253,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/controller-manager - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: api branch: release-1.29 @@ -262,7 +262,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/cloud-provider - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: api branch: release-1.29 @@ -271,7 +271,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/kube-controller-manager - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: apimachinery branch: release-1.29 @@ -280,7 +280,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/cluster-bootstrap - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: apimachinery branch: release-1.29 @@ -289,7 +289,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/csi-translation-lib - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: api branch: release-1.29 @@ -298,7 +298,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/mount-utils - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 source: branch: release-1.29 dirs: @@ -307,7 +307,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/legacy-cloud-providers - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: api branch: release-1.29 @@ -316,7 +316,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/kubectl - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: api branch: release-1.29 @@ -325,7 +325,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/pod-security-admission - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: api branch: release-1.29 @@ -334,7 +334,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/dynamic-resource-allocation - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: apimachinery branch: release-1.29 @@ -343,7 +343,7 @@ index 62071c41ee2..f1dae4f5031 100644 - staging/src/k8s.io/endpointslice - name: release-1.29 - go: 1.21.6 -+ go: 1.21.4 ++ go: 1.24.2 dependencies: - repository: api branch: release-1.29 @@ -352,7 +352,7 @@ index 62071c41ee2..f1dae4f5031 100644 recursive-delete-patterns: - '*/.gitattributes' -default-go-version: 1.21.6 -+default-go-version: 1.21.4 ++default-go-version: 1.24.2 diff --git a/test/images/Makefile b/test/images/Makefile index 92e854649d5..6fb6d7c3e38 100644 --- a/test/images/Makefile @@ -362,7 +362,7 @@ index 92e854649d5..6fb6d7c3e38 100644 DOCKER_CERT_BASE_PATH ?= QEMUVERSION=v5.1.0-2 -GOLANG_VERSION=1.21.6 -+GOLANG_VERSION=1.21.4 ++GOLANG_VERSION=1.24.2 export ifndef WHAT diff --git a/kubernetes.spec b/kubernetes.spec index 1c0e9c1..a5cf0fb 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -3,7 +3,7 @@ Name: kubernetes Version: 1.29.1 -Release: 11 +Release: 12 Summary: Container cluster management License: ASL 2.0 URL: https://k8s.io/kubernetes @@ -125,6 +125,8 @@ mv .go* src/k8s.io/kubernetes/. %build pushd src/k8s.io/kubernetes/ +# go internal linker does not provide build ids; use KUBE_CGO_OVERRIDES to force external linker +export KUBE_CGO_OVERRIDES="kube-proxy kubeadm kube-apiserver kube-controller-manager kubelet kube-scheduler kubectl" export KUBE_GIT_TREE_STATE="clean" export KUBE_GIT_COMMIT=%{commit} export KUBE_GIT_VERSION=v{version} @@ -290,6 +292,12 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \ %systemd_postun kubelet kube-proxy %changelog +* Mon Aug 04 2025 dongyuzhen - 1.29.1-12 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:adapt go version + * Mon Feb 24 2025 liuxu - 1.29.1-11 - Type:bugfix - CVE:NA -- Gitee