update to 1.29.1
This commit is contained in:
parent
454d1d4ade
commit
4a77efde52
@ -2,12 +2,12 @@
|
|||||||
%global _buildshell /bin/bash
|
%global _buildshell /bin/bash
|
||||||
|
|
||||||
Name: kubernetes
|
Name: kubernetes
|
||||||
Version: 1.25.3
|
Version: 1.29.1
|
||||||
Release: 3
|
Release: 1
|
||||||
Summary: Container cluster management
|
Summary: Container cluster management
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: https://k8s.io/kubernetes
|
URL: https://k8s.io/kubernetes
|
||||||
Source0: https://github.com/kubernetes/kubernetes/archive/v1.25.3.tar.gz
|
Source0: https://github.com/kubernetes/kubernetes/archive/v1.29.1.tar.gz
|
||||||
Source1: kube-proxy.service
|
Source1: kube-proxy.service
|
||||||
Source2: kube-apiserver.service
|
Source2: kube-apiserver.service
|
||||||
Source3: kube-scheduler.service
|
Source3: kube-scheduler.service
|
||||||
@ -24,15 +24,6 @@ Source13: kubernetes-accounting.conf
|
|||||||
Source14: kubeadm.conf
|
Source14: kubeadm.conf
|
||||||
Source15: kubernetes.conf
|
Source15: kubernetes.conf
|
||||||
|
|
||||||
Patch0001: 0001-fix-compile-options.patch
|
|
||||||
Patch0002: 0002-kubelet-support-exec-and-attach-websocket-protocol.patch
|
|
||||||
Patch0003: 0003-Escape-terminal-special-characters-in-kubectl-112553.patch
|
|
||||||
Patch0004: 0004-Return-error-for-localhost-seccomp-type-with-no-loca.patch
|
|
||||||
Patch0005: 0005-Validate-etcd-paths.patch
|
|
||||||
Patch0006: 0006-fix-node-address-validation.patch
|
|
||||||
Patch0007: 0007-Add-ephemeralcontainer-to-imagepolicy-securityaccoun.patch
|
|
||||||
Patch1000: 1000-add-riscv-support.patch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Container cluster management.
|
Container cluster management.
|
||||||
|
|
||||||
@ -96,13 +87,20 @@ Help documents for kubernetes.
|
|||||||
mkdir -p src/k8s.io/kubernetes
|
mkdir -p src/k8s.io/kubernetes
|
||||||
mv $(ls | grep -v "^src$") src/k8s.io/kubernetes/.
|
mv $(ls | grep -v "^src$") src/k8s.io/kubernetes/.
|
||||||
|
|
||||||
|
# mv command above skips all dot files. Move .generated_files and all
|
||||||
|
#.go* files
|
||||||
|
mv .generated_files src/k8s.io/kubernetes/.
|
||||||
|
mv .go* src/k8s.io/kubernetes/.
|
||||||
|
|
||||||
|
###############
|
||||||
|
|
||||||
%build
|
%build
|
||||||
pushd src/k8s.io/kubernetes/
|
pushd src/k8s.io/kubernetes/
|
||||||
export KUBE_GIT_TREE_STATE="clean"
|
export KUBE_GIT_TREE_STATE="clean"
|
||||||
export KUBE_GIT_COMMIT=%{commit}
|
export KUBE_GIT_COMMIT=%{commit}
|
||||||
export KUBE_GIT_VERSION=v{version}
|
export KUBE_GIT_VERSION=v{version}
|
||||||
export KUBE_EXTRA_GOPATH=$(pwd)/Godeps/_workspace
|
export KUBE_EXTRA_GOPATH=$(pwd)/Godeps/_workspace
|
||||||
export CGO_CFLAGS="-fstack-protector-strong -fPIE -D_FORTIFY_SOURCE=2 -O2"
|
export CGO_CFLAGS="-fstack-protector-strong -fPIE -D_FORTIFY_SOURCE=2 -O2 -lc"
|
||||||
export CGO_LDFLAGS="-Wl,-z,relro,-z,now -Wl,-z,noexecstack -pie"
|
export CGO_LDFLAGS="-Wl,-z,relro,-z,now -Wl,-z,noexecstack -pie"
|
||||||
|
|
||||||
make WHAT="cmd/kube-proxy"
|
make WHAT="cmd/kube-proxy"
|
||||||
@ -263,6 +261,12 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \
|
|||||||
%systemd_postun kubelet kube-proxy
|
%systemd_postun kubelet kube-proxy
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 20 2024 liuxu <liuxu156@huawei.com> - 1.29.1-1
|
||||||
|
- Type:update
|
||||||
|
- CVE:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:update to 1.29.1
|
||||||
|
|
||||||
* Mon Sep 25 2023 misaka00251 <liuxin@iscas.ac.cn> - 1.25.3-3
|
* Mon Sep 25 2023 misaka00251 <liuxin@iscas.ac.cn> - 1.25.3-3
|
||||||
- Fix add riscv64 support patch
|
- Fix add riscv64 support patch
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user