升级k3s到v1.29.1-k3s2-k3s-AtomGit

已开启

升级k3s到v1.29.1-k3s2 #22

AtomGit-Bot创建于 2025年6月24日从refs/pull/22/head 合入到 openEuler-24.03-LTS-SP2

升级k3s到v1.29.1-k3s2 #22

已开启

AtomGit-Bot创建于 2025年6月24日

从refs/pull/22/head合入到openEuler-24.03-LTS-SP2

共 5 个文件变更+11-21

Mbuild-tar-create.sh+5-17

	@@ -1,18 +1,18 @@
1	#!/bin/bash	1	#!/bin/bash
2	-
3	set -e	2	set -e
4	-if [ ! -f ./v1.24.2+rc1+k3s2.tar.gz ];then	3	+
		4	+if [ ! -f ./v1.29.1-k3s2.tar.gz ];then
5	echo "this script should be executed in source directory"	5	echo "this script should be executed in source directory"
6	exit	6	exit
7	fi	7	fi
8		8
9	-tar -xvf v1.24.2+rc1+k3s2.tar.gz	9	+tar -xvf v1.29.1-k3s2.tar.gz
10		10
11	TRAEFIK_CHART_VERSION="10.19.3"	11	TRAEFIK_CHART_VERSION="10.19.3"
12	TRAEFIK_PACKAGE_VERSION="00"	12	TRAEFIK_PACKAGE_VERSION="00"
13	TRAEFIK_FILE=traefik-${TRAEFIK_CHART_VERSION}${TRAEFIK_PACKAGE_VERSION}.tgz	13	TRAEFIK_FILE=traefik-${TRAEFIK_CHART_VERSION}${TRAEFIK_PACKAGE_VERSION}.tgz
14	TRAEFIK_CRD_FILE=traefik-crd-${TRAEFIK_CHART_VERSION}${TRAEFIK_PACKAGE_VERSION}.tgz	14	TRAEFIK_CRD_FILE=traefik-crd-${TRAEFIK_CHART_VERSION}${TRAEFIK_PACKAGE_VERSION}.tgz
15	-TRAEFIK_URL=https://helm.traefik.io/traefik/traefik-${TRAEFIK_CHART_VERSION}.tgz	15	+TRAEFIK_URL=https://traefik.github.io/charts/traefik/traefik-${TRAEFIK_CHART_VERSION}.tgz
16	CHARTS_DIR=build/static/charts	16	CHARTS_DIR=build/static/charts
17	RUNC_DIR=build/src/github.com/opencontainers/runc	17	RUNC_DIR=build/src/github.com/opencontainers/runc
18	CONTAINERD_DIR=build/src/github.com/containerd/containerd	18	CONTAINERD_DIR=build/src/github.com/containerd/containerd
	@@ -70,19 +70,7 @@ download_and_package_traefik () {
70	done	70	done
71	)	71	)
72		72
73	- # Copy base template and apply variables to the template
74	mkdir -p ${TRAEFIK_TMP_CRD}	73	mkdir -p ${TRAEFIK_TMP_CRD}
75	- echo $(pwd)
76	- cp -R ./k3s-1.24.2-rc1-k3s2/scripts/chart-templates/crd-base/* ${TRAEFIK_TMP_CRD}
77	- for template_file in $(find ${TRAEFIK_TMP_CRD} -type f \| sort); do
78	- # Applies any environment variables currently set onto your template file
79	- echo "Templating ${template_file}"
80	- eval "echo \"$(sed 's/"/\\"/g' ${template_file})\"" > ${template_file}
81	- done
82	-
83	- # Move anything from ${f}/charts-crd/overlay-upstream to the main chart
84	- cp -R ${TRAEFIK_TMP_CRD}/overlay-upstream/* ${TRAEFIK_TMP_CHART}
85	- rm -rf ${TRAEFIK_TMP_CRD}/overlay-upstream
86		74
87	# Modify charts to support system-default-registry	75	# Modify charts to support system-default-registry
88	echo -e 'global:\n systemDefaultRegistry: ""' >> ${TRAEFIK_TMP_CHART}/values.yaml	76	echo -e 'global:\n systemDefaultRegistry: ""' >> ${TRAEFIK_TMP_CHART}/values.yaml
	@@ -120,4 +108,4 @@ download_and_package_traefik
120	tar -cvf build.tar.gz ./build	108	tar -cvf build.tar.gz ./build
121	rm -rf ./build	109	rm -rf ./build
122	rm -rf traefik*	110	rm -rf traefik*
123	-rm -rf ./k3s-1.24.2-rc1-k3s2	111	+rm -rf ./k3s-1.29.1-k3s2

Mbuild.tar.gz+0-0

Binary files do not support preview

Mk3s.spec+6-4

	@@ -1,9 +1,9 @@
1	%define debug_package %{nil}	1	%define debug_package %{nil}
2	-%define baseversion 1.24	2	+%define baseversion 1.29
3		3
4	Name: k3s	4	Name: k3s
5	-Version: 1.24.2+rc1+k3s2	5	+Version: 1.29.1+k3s2
6	-Release: 4	6	+Release: 5
7	Summary: Installer for k3s optimised for openSUSE MicroOS	7	Summary: Installer for k3s optimised for openSUSE MicroOS
8	License: Apache-2.0	8	License: Apache-2.0
9	Group: System/Management	9	Group: System/Management
	@@ -24,7 +24,6 @@ Requires: k3s-selinux
24	Requires: iptables	24	Requires: iptables
25	Conflicts: cri-tools	25	Conflicts: cri-tools
26	Conflicts: kubectl	26	Conflicts: kubectl
27	-Conflicts: kubernetes-client
28	Conflicts: kubernetes-client-provider	27	Conflicts: kubernetes-client-provider
29		28
30	Requires(post): systemd	29	Requires(post): systemd
	@@ -93,6 +92,9 @@ cp install.sh %{buildroot}%{_sbindir}/k3s-install.sh
93	%{_sbindir}/k3s-install.sh	92	%{_sbindir}/k3s-install.sh
94		93
95	%changelog	94	%changelog
		95	+* Tue Jun 24 2025 Renjian Zhou <zhourenjian@huawei.com> - 1.29.1+k3s2-5
		96	+- upgrade k3s version to 1.29.1+k3s2
		97	+
96	* Sun Apr 21 2024 Yuncheng Zhu <zhuyuncheng@huawei.com> - 1.24.2+rc1+k3s2-4	98	* Sun Apr 21 2024 Yuncheng Zhu <zhuyuncheng@huawei.com> - 1.24.2+rc1+k3s2-4
97	- change requirement docker-runc to runc	99	- change requirement docker-runc to runc
98		100

Dv1.24.2+rc1+k3s2.tar.gz+0-0

Binary files do not support preview

Av1.29.1+k3s2.tar.gz+0-0

Binary files do not support preview