diff --git a/build-tar-create.sh b/build-tar-create.sh index baa38f0dddf17f599ebcab6b53cc57e877018c39..6d225ef50ea909e5a025ab7c56fe048da84d9d18 100755 --- a/build-tar-create.sh +++ b/build-tar-create.sh @@ -1,18 +1,18 @@ #!/bin/bash - set -e -if [ ! -f ./v1.24.2+rc1+k3s2.tar.gz ];then + +if [ ! -f ./v1.29.1-k3s2.tar.gz ];then echo "this script should be executed in source directory" exit fi -tar -xvf v1.24.2+rc1+k3s2.tar.gz +tar -xvf v1.29.1-k3s2.tar.gz TRAEFIK_CHART_VERSION="10.19.3" TRAEFIK_PACKAGE_VERSION="00" TRAEFIK_FILE=traefik-${TRAEFIK_CHART_VERSION}${TRAEFIK_PACKAGE_VERSION}.tgz TRAEFIK_CRD_FILE=traefik-crd-${TRAEFIK_CHART_VERSION}${TRAEFIK_PACKAGE_VERSION}.tgz -TRAEFIK_URL=https://helm.traefik.io/traefik/traefik-${TRAEFIK_CHART_VERSION}.tgz +TRAEFIK_URL=https://traefik.github.io/charts/traefik/traefik-${TRAEFIK_CHART_VERSION}.tgz CHARTS_DIR=build/static/charts RUNC_DIR=build/src/github.com/opencontainers/runc CONTAINERD_DIR=build/src/github.com/containerd/containerd @@ -70,19 +70,7 @@ download_and_package_traefik () { done ) - # Copy base template and apply variables to the template mkdir -p ${TRAEFIK_TMP_CRD} - echo $(pwd) - cp -R ./k3s-1.24.2-rc1-k3s2/scripts/chart-templates/crd-base/* ${TRAEFIK_TMP_CRD} - for template_file in $(find ${TRAEFIK_TMP_CRD} -type f | sort); do - # Applies any environment variables currently set onto your template file - echo "Templating ${template_file}" - eval "echo \"$(sed 's/"/\\"/g' ${template_file})\"" > ${template_file} - done - - # Move anything from ${f}/charts-crd/overlay-upstream to the main chart - cp -R ${TRAEFIK_TMP_CRD}/overlay-upstream/* ${TRAEFIK_TMP_CHART} - rm -rf ${TRAEFIK_TMP_CRD}/overlay-upstream # Modify charts to support system-default-registry echo -e 'global:\n systemDefaultRegistry: ""' >> ${TRAEFIK_TMP_CHART}/values.yaml @@ -120,4 +108,4 @@ download_and_package_traefik tar -cvf build.tar.gz ./build rm -rf ./build rm -rf traefik* -rm -rf ./k3s-1.24.2-rc1-k3s2 +rm -rf ./k3s-1.29.1-k3s2 diff --git a/build.tar.gz b/build.tar.gz index a46998316f9da979852213420d1fab8fe3c07ac8..9f04ce1a75f08ed8576cc972996e0cdf244e0203 100644 Binary files a/build.tar.gz and b/build.tar.gz differ diff --git a/k3s.spec b/k3s.spec index a1f1aec1a42d59b4aeef5ae1a3fee6f954a79d84..30ae08794b528b0e2e4fcfa27a81b15a898d6b50 100644 --- a/k3s.spec +++ b/k3s.spec @@ -1,9 +1,9 @@ %define debug_package %{nil} -%define baseversion 1.24 +%define baseversion 1.29 Name: k3s -Version: 1.24.2+rc1+k3s2 -Release: 4 +Version: 1.29.1+k3s2 +Release: 5 Summary: Installer for k3s optimised for openSUSE MicroOS License: Apache-2.0 Group: System/Management @@ -24,7 +24,6 @@ Requires: k3s-selinux Requires: iptables Conflicts: cri-tools Conflicts: kubectl -Conflicts: kubernetes-client Conflicts: kubernetes-client-provider Requires(post): systemd @@ -93,6 +92,9 @@ cp install.sh %{buildroot}%{_sbindir}/k3s-install.sh %{_sbindir}/k3s-install.sh %changelog +* Tue Jun 24 2025 Renjian Zhou - 1.29.1+k3s2-5 +- upgrade k3s version to 1.29.1+k3s2 + * Sun Apr 21 2024 Yuncheng Zhu - 1.24.2+rc1+k3s2-4 - change requirement docker-runc to runc diff --git a/v1.24.2+rc1+k3s2.tar.gz b/v1.24.2+rc1+k3s2.tar.gz deleted file mode 100644 index 3f862fb0980dcd0e489c03d9bedbae70e16126ea..0000000000000000000000000000000000000000 Binary files a/v1.24.2+rc1+k3s2.tar.gz and /dev/null differ diff --git a/v1.29.1+k3s2.tar.gz b/v1.29.1+k3s2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b52498d984f085daf7b2efd984eb7f077631d825 Binary files /dev/null and b/v1.29.1+k3s2.tar.gz differ