diff --git a/kubernetes.spec b/kubernetes.spec index 34559bb82ed245ca3fdb6b705bb0e4dde7a9a5a4..2e23d8a50164b6961943373b1f84ba022af48791 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -3,7 +3,7 @@ Name: kubernetes Version: 1.29.1 -Release: 9 +Release: 10 Summary: Container cluster management License: ASL 2.0 URL: https://k8s.io/kubernetes @@ -31,12 +31,9 @@ Patch0004: 0004-Add-processStartTime-in-metrics-slis.patch Patch0005: 0005-fix-a-bug-where-the-uploaded-kubelet-configuration-in-kube-system-kubelet-config-ConfigMap-does-not-respect-user.patch Patch0006: 0006-adapt-go-version.patch Patch0007: 0007-gitRepo-volume-directory-must-be-max-1-level-deep.patch -%ifarch riscv64 + Patch1000: 1000-Add-riscv64-support-for-v1.29.1-kubernetes.patch -%endif -%ifarch loong64 Patch1001: 1001-Add-loong64-host-build-support.patch -%endif %description Container cluster management. @@ -97,7 +94,23 @@ Summary: Help documents for kubernetes Help documents for kubernetes. %prep -%autosetup -n kubernetes-%{version} -p1 +%setup -n %{name}-%{version} +%patch 0001 -p1 +%patch 0002 -p1 +%patch 0003 -p1 +%patch 0004 -p1 +%patch 0005 -p1 +%patch 0006 -p1 +%patch 0007 -p1 + +%ifarch riscv64 +%patch 1000 -p1 +%endif + +%ifarch loongarch64 +%patch 1001 -p1 +%endif + mkdir -p src/k8s.io/kubernetes mv $(ls | grep -v "^src$") src/k8s.io/kubernetes/. @@ -275,6 +288,13 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \ %systemd_postun kubelet kube-proxy %changelog +* Fri Dec 06 2024 shenzhongwei - 1.29.1-10 +- TypeLbugfix +- CVE:NA +- SUG:NA +- DECS:remove the architecture judgment in the patches section; + include all patches in the source package. + * Thu Dec 05 2024 liuxu - 1.29.1-9 - Type:bugfix - CVE:NA