summaryrefslogtreecommitdiff
path: root/sys-cluster/k3s
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-07-10 19:28:02 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-07-10 19:28:02 +0100
commit62f7102650b24618880e8e6f08fcb8fbd235025b (patch)
tree914a3a8577147ada92d191ad5dd0c2b52d2673a5 /sys-cluster/k3s
parent0d7aefa5885e7552b4c2221df9f54e5930696228 (diff)
gentoo auto-resync : 10:07:2022 - 19:28:02
Diffstat (limited to 'sys-cluster/k3s')
-rw-r--r--sys-cluster/k3s/Manifest12
-rw-r--r--sys-cluster/k3s/k3s-1.23.6_p1.ebuild102
-rw-r--r--sys-cluster/k3s/k3s-1.24.1_p1.ebuild102
-rw-r--r--sys-cluster/k3s/k3s-1.24.2_p2.ebuild (renamed from sys-cluster/k3s/k3s-1.23.7_p1.ebuild)2
4 files changed, 3 insertions, 215 deletions
diff --git a/sys-cluster/k3s/Manifest b/sys-cluster/k3s/Manifest
index a5464c73d82e..2a27678507c1 100644
--- a/sys-cluster/k3s/Manifest
+++ b/sys-cluster/k3s/Manifest
@@ -2,21 +2,13 @@ AUX k3s.confd 49 BLAKE2B 1320691aa5dce4b97374c1456e52732e4c7f3dca2a0fcb781db9264
AUX k3s.initd 976 BLAKE2B 155d1598f307b613b0aab30098105551860048ae17f783920976c73d902535303e8d2cad02bd054af75e0936a17eb592813f3acb3f405e50ec07b5022b587f19 SHA512 21538ca90ac3903deb6c882a9efa60869002f25784d06a59c67b882b611442ce24beb86ee793bcd2b37c3ab9a32ca7b74b69acdd30b1438c66705d749f522b4c
AUX k3s.logrotated 37 BLAKE2B 8e106b2ae826d1724adb3cf6970cb46b53247ce77a8206ce9ffdaea372ee36f164f38ae8044afe814f9a3aa24d1f3c8d8d75452949ffaee0644948a6ae92fb52 SHA512 f0732ad9d003df155ab9f919909db8c62024c546412f77b3fc6c1a94faf150c532de61e73421a880b7be55edaa4367e01084f59b6f99211a3dcaac1a38f28d68
AUX k3s.service 597 BLAKE2B 067ea095d2ad948a59e6fcc6ecc569d3f8fa4e802e381e5ccc48988c70c5e8e9e4335afc7cf5a2e830d22bd89cabffbc6fb9161da73599be75b305eb28bea14a SHA512 9741575f844da8ed96e230c443ec6662bff22be8602b420eb74fc6a72d09f36a5fddb8426894e63b7a8c2918a36fc717a38dfbcf003b56f47c13c06c4fc96825
-DIST k3s-1.23.6_p1-vendor.tar.gz 31455285 BLAKE2B c924b3cbbc512757d05127dc284e9d843e6f53bb732f7be51e885e7e130a0b8a9aa1a8b6141e4947c063d7276480321a5d7752a28aa825f35ae73c6bab33e144 SHA512 74dcd8b86ed54dd7bb84c5544846d35ed3ea9c6241c268c7c37c4f9e09e6d0d255b3f6661c3e2af493b50cfae7b7c5fb4623d92b241de9c552b3a97f4ee50090
-DIST k3s-1.23.7_p1-vendor.tar.gz 31644944 BLAKE2B 29a61547f7765c6b21b7e259e1bff5fed4da68c319dbd3df8f66afcbe09e3e4582b56c2e4a6a41f688dbc651e98bdd714f06ac72a70f50fc241c2f52a057a47e SHA512 6216b7bfcad81dd9dad40bf9d35d54f295461c50ffc46795122f1656c1d731de9752f8a50acab23dfec9479e95de6079d27c0588abb1a3f5c48d7b0a52c2e5fb
-DIST k3s-1.24.1_p1-vendor.tar.gz 31390781 BLAKE2B 5e93044570ae7a0511b14e797765ba6b4db0e28a0752b35e181bee32be50284adac958baf29d3bb4d6913ef43dcfb8cc6e3f6e312d2dcc447c716e2195707573 SHA512 b42aa8f6443a881da13cb731f4486150c69911a395a757467a7a5b9bba1e450be8be4714984f65ad5b41ffef812a8d4c736f12a4a1cba12eaa9e1b52c7acda23
DIST k3s-1.24.2_p1-vendor.tar.gz 31410828 BLAKE2B 410dc4de95201fb8654571c343458e458e17c52b2b1e2bcf2777df04a50ae54bb119fa88086ee61b7f569d905b0e58df12446c5bd145b46027930a57f5aa033a SHA512 ace54126bc47bc25bf2d2dc13c7ad085d2815d6303ab851ec8738aff5765b9e6f77e6a23fd41375999e03dd215d6b3d54d122d820559dd36dabd87e41ba95093
-DIST k3s-cni-plugins-1.0.1.tar.gz 5711129 BLAKE2B d75557a10de1dccd79b1953c167b0054c229a9cade891b87ece0133be4660fde5c442f253cec8938db87886fc6c39d5a68214262c9ec5c3266a1321ebb75bee7 SHA512 dff27fa602e948ab51745151614713262bc25dfe687a0f3e8b7bab4aa63d40e5e5cfa652e34455fea3f1f38558c3f648aa6021f134d78b4b49e7764f8e894d07
+DIST k3s-1.24.2_p2-vendor.tar.gz 31418274 BLAKE2B d0fb00c1419cf894eebb83b4f7d29f260628dd06a3a6376cf60257bcc0b571e743954013877e6e85de6b22eb643799a09bf79d898419383951270944ea0e6fe4 SHA512 d0dd6e9804e1e5f7abc9b9429bf0e208baa9da0ee405f7fc3b241e03f39a40284ad098cf1832ac3292f7ee12de66711f9cfc6b01a99ad97fb6653e6236badbb8
DIST k3s-cni-plugins-1.1.1.tar.gz 3122345 BLAKE2B 270283ffb746ca97ad147b368143c56bd9641b7ebcb1b2b61f80ffea3336b240b28c9b9496bd2f6eb6d7e5382da4979c26e37eca30ac19fd362ed822ba94f300 SHA512 53dcd363231325553a5c9e804fc9005471fe5c05c87aae0340214c146eba66a3761d73976ba0145d86a663a2b0a1941e6cc5823b6d05e002a9ef18e41e10ac3c
-DIST k3s-containerd-1.5.11-k3s2.tar.gz 9669969 BLAKE2B 11ec3ead4c17773978e21d1ac19a321c3e3e453f12bd79ec67bdfdfa061dac8d09278dabc9bfd0fc8795b70325683b236b43cdc5ebcd9873a40baac124b1b748 SHA512 dfe3a8e6c31684c378c156f4ce3f98c0307df3464d3b3d2cca4a04be8f158d01b279362af5eb447cf24aad7f7ff28d87e92dd64430e480afcee9a9cef0eb2b8a
-DIST k3s-containerd-1.5.13-k3s1.tar.gz 9688943 BLAKE2B 776b5bac2760a074817440238f6d98d789a9bf94af81a949776f84126220fb4dca44f84cb9babe69a691fdbcce0ed54a1f97bfd3d3efc6f5f8d29116e2cec540 SHA512 ed031e722344858eb5f4e5ce7a12c95f6ca7b86c7a83013f5000779cc8053fa82c99bbe7521d36d35520c724aee1296148e2448269b75b5163969f710dcf0d93
DIST k3s-containerd-1.6.6-k3s1.tar.gz 10337871 BLAKE2B c4d038c2654243f61f907942a7ddc6d6584c50a04db3cd539f8cbb46901737744b39ca7c31ef51e84ba87faafbfa1962a36e2912a1bfee9d922e2f15e3253970 SHA512 11a2247ea8deb498fb8f0fbd90735d5c4e980d3744ddf1c17b1bf438379c55124a57838a27bc6df7a0b0421881d6072f0cd0bbb4c4835aa34ea894af02334fa8
DIST k3s-root-amd64-0.11.0.tar 11878400 BLAKE2B 6227ba08e305f062ed814a6b997313415c08e469b05f0501c86f7df25e8a3c9ecb43675613337f6d038faa5153aae98eb44cad9bc170967e0a216ba5ec27559e SHA512 d181117230ad941b40173c3b7dc3d2bb0f3d44a28e9715d85c752193c6058bb6be4a4b8f061df73fed690629a7b2b330185b38bb90ce7fcc9c808096516cb0a3
-DIST k3s-runc-v1.0.3-r1.tar.gz 2375241 BLAKE2B 0fb9368ab5442462001c15a67a71821133ad90d16cac5aac760e52b2477db69c0a5dd59df42601119b19ede508889796c994a24624f88ec6a1a29dad19e0bf33 SHA512 64a1894c2b4ed5a68b185e88548fc9fbbd01d8a9495feed59fb196aa06763d64cfb71ca6cbc09d1defa26a0d94ad58626296585741f23df2e290147ba6c4c26e
DIST k3s-runc-v1.1.2-r1.tar.gz 2332953 BLAKE2B e6047baa799e97d201630f5ff438ca8742ef4c9f465c3728fe2e4bd7f18a571172cb8f994c0e9ffba4f7ae75088626583602f49e0e9f4764c96157820c332b5b SHA512 61d8cc82f49e3bc1cf4cc4ae18a9d9c8f4ae93e8380ce6fa9034b154bd1b915339ee65babdf7518021d015a3c31545fcbad5bbf0c4579c7eb50988877121f049
DIST traefik-10.19.3.tgz 25287 BLAKE2B c43a5e066d78e066bc4449ad1d7a3796c99c5f029244dac5494a452592424a9be057b6a3d8eddd174d8daab2b322c4f54e39eae53fba67e97e1ebdb92ce2fd65 SHA512 6df4b186c4caad09abf47469757c1d26d3b593531704af53eb262208f1efa27b5b09b178c6dd6721e78362877e6ba3b2c8c3bfbc91fe152ce090b53ac283acf9
-EBUILD k3s-1.23.6_p1.ebuild 4072 BLAKE2B fbf06dbcb0ee7dbf8bdb41d7eb4cdfdb5d9b8e8fd4d1b48b5f92609b7935c9e5002cc6f2e173e85d6ca35bf8319418d4a422e159c4c77ff71461073300b8fb22 SHA512 fc786765567c37b29bded0d55357addc0647ac611d55d44df5df4f0497965bdac5bb928c910dd995663dabe6d07f194bc31d6e324132a00931712c1a2cfebef2
-EBUILD k3s-1.23.7_p1.ebuild 4072 BLAKE2B 7a6484206309dfab533f3122f725edf491228de05695106fdb454bc0bed7e8b1faf65c57f927f35a50b27eecd5abf127dadb2031e94a33e22ce5b8271d9d9379 SHA512 eeee965bbfca05a847ea5f9919f0c16a8b9df4690df24f888522944b62a5eea609a4db62c68a162f64164483d35ea90ae0dd80e07af97ea3100e8187336cc134
-EBUILD k3s-1.24.1_p1.ebuild 4072 BLAKE2B 7a6484206309dfab533f3122f725edf491228de05695106fdb454bc0bed7e8b1faf65c57f927f35a50b27eecd5abf127dadb2031e94a33e22ce5b8271d9d9379 SHA512 eeee965bbfca05a847ea5f9919f0c16a8b9df4690df24f888522944b62a5eea609a4db62c68a162f64164483d35ea90ae0dd80e07af97ea3100e8187336cc134
EBUILD k3s-1.24.2_p1.ebuild 4071 BLAKE2B a8a9b4a1ddd84152447bbd85c9e417b4f68271830b3c377b849131f118f41412227c77fffeb0dc2dde3548bc0704688a564ac18f41059d98135544318343b517 SHA512 936279e847898a756f33fd652ad3dc968031bdb77f55ae4203a531170b09acea7738381f38c147b0a75852a8f029c3f2ba17673bf1fcbab4fb7b8bd5ad6e321a
+EBUILD k3s-1.24.2_p2.ebuild 4071 BLAKE2B a8a9b4a1ddd84152447bbd85c9e417b4f68271830b3c377b849131f118f41412227c77fffeb0dc2dde3548bc0704688a564ac18f41059d98135544318343b517 SHA512 936279e847898a756f33fd652ad3dc968031bdb77f55ae4203a531170b09acea7738381f38c147b0a75852a8f029c3f2ba17673bf1fcbab4fb7b8bd5ad6e321a
MISC metadata.xml 515 BLAKE2B dc5e9d23a7b4d84ec392036cd87975b9117133b3a68eb1a69a38637dfca36f4e721be42dbd1ee0dd73585602800ef49d4255ff736be7cdc97e7f2d07b59af99b SHA512 8ee732afdfd59151faa18dbc68075d0c528113b8ea3f9939d0a83fbf7f06deefe2dee27079b7317ee98ea165e81cf4514f1d305564e21b3e1fc4760d2350fd46
diff --git a/sys-cluster/k3s/k3s-1.23.6_p1.ebuild b/sys-cluster/k3s/k3s-1.23.6_p1.ebuild
deleted file mode 100644
index f4cbad57825e..000000000000
--- a/sys-cluster/k3s/k3s-1.23.6_p1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module linux-info systemd
-
-DESCRIPTION="Lightweight Kubernetes"
-HOMEPAGE="https://k3s.io"
-K3S_CONTAINERD_VERSION=1.5.11-k3s2
-K3S_RUNC_VERSION=v1.0.3
-K3S_ROOT_VERSION=0.11.0
-K3S_TRAEFIK_VERSION=10.19.3
-K3S_TRAEFIK_PACKAGE_VERSION=00
-K3S_CNIPLUGINS_VERSION=1.0.1
-CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN"
-
-MY_PV=${PV%_p*}+k3s${PV#*_p}
-SRC_URI="https://github.com/zmedico/k3s/archive/refs/tags/v${MY_PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
- ${EGO_SUM_SRC_URI}
- https://github.com/k3s-io/containerd/archive/refs/tags/v${K3S_CONTAINERD_VERSION}.tar.gz -> k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz
- https://github.com/opencontainers/runc/archive/refs/tags/${K3S_RUNC_VERSION}.tar.gz -> k3s-runc-${K3S_RUNC_VERSION}-r1.tar.gz
- https://helm.traefik.io/traefik/traefik-${K3S_TRAEFIK_VERSION}.tgz
- https://github.com/rancher/plugins/archive/refs/tags/v${K3S_CNIPLUGINS_VERSION}-k3s1.tar.gz -> k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz
- amd64? ( https://github.com/rancher/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar -> k3s-root-amd64-${K3S_ROOT_VERSION}.tar )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+kubectl-symlink rootless"
-REQUIRED_USE="|| ( amd64 )"
-DEPEND="
- app-misc/yq
- net-firewall/conntrack-tools
- sys-fs/btrfs-progs
- rootless? ( app-containers/slirp4netns )
-"
-RDEPEND="kubectl-symlink? ( !sys-cluster/kubectl )"
-RESTRICT+=" test"
-
-S=${WORKDIR}/${PN}-${MY_PV/+/-}-vendor
-
-src_unpack() {
- unpack ${P}-vendor.tar.gz
- cd "${S}" || die
- mkdir -p bin/aux build/static/charts cache etc || die
- cp "${DISTDIR}/traefik-${K3S_TRAEFIK_VERSION}.tgz" build/static/charts/traefik-${K3S_TRAEFIK_VERSION}${K3S_TRAEFIK_PACKAGE_VERSION}.tgz || die
- cp "${DISTDIR}/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz" cache/ || die
-}
-
-src_prepare() {
- local filename pattern replacement
- default
-
- local CONTAINERD_DIR=build/src/github.com/containerd/containerd
- mkdir -p "${CONTAINERD_DIR}" || die
- tar -x --strip-components=1 -f "${DISTDIR}/k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz" -C "${CONTAINERD_DIR}" || die
- if has_version -b ">=dev-lang/go-1.18"; then
- # https://bugs.gentoo.org/835601
- sed -i -e "/github.com\/containerd\/containerd => .\/.empty-mod/d" "${CONTAINERD_DIR}"/{go.mod,vendor/modules.txt} || die
- fi
-
- local RUNC_DIR=build/src/github.com/opencontainers/runc
- mkdir -p "${RUNC_DIR}" || die
- tar -x --strip-components=1 -f "${DISTDIR}/k3s-runc-${K3S_RUNC_VERSION}-r1.tar.gz" -C "${RUNC_DIR}" || die
-
- # Disable download for files fetched via SRC_URI.
- sed -e 's:^[[:space:]]*curl:#\0:' \
- -e 's:^[[:space:]]*git:#\0:' \
- -e 's:^rm -rf \${CHARTS_DIR}:#\0:' \
- -e 's:^rm -rf \${RUNC_DIR}:#\0:' \
- -e 's:^rm -rf \${CONTAINERD_DIR}:#\0:' \
- -e 's:yq e :yq -r :' \
- -e "s:^setup_tmp\$:TMP_DIR=${S}/build/static/charts:" \
- -i scripts/download || die
- sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die
- pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR'
- filename=scripts/build
- grep -qF "${pattern}" "${filename}" || \
- die "failed to locate plugins clone command"
- sed -e "s|${pattern}|mkdir -p \"\$WORKDIR\" \\&\\& tar -xzf \"${S}/cache/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz\" --strip-components=1 -C \"\$WORKDIR\"|" \
- -e 's|rm -rf $TMPDIR||' \
- -i "${filename}" || die
- sed -e 's:/usr/local/bin:/usr/bin:g' -i k3s.service || die
-}
-
-src_compile() {
- mkdir -p build/data || die
- "${BASH}" -ex ./scripts/download || die
- ./scripts/build || die
- ./scripts/package-cli || die
-}
-
-src_install() {
- dobin "dist/artifacts/${PN}"
- use kubectl-symlink && dosym k3s /usr/bin/kubectl
- systemd_dounit "${FILESDIR}/${PN}.service"
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- dodoc README.md
-}
diff --git a/sys-cluster/k3s/k3s-1.24.1_p1.ebuild b/sys-cluster/k3s/k3s-1.24.1_p1.ebuild
deleted file mode 100644
index 30e4c15b0893..000000000000
--- a/sys-cluster/k3s/k3s-1.24.1_p1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit go-module linux-info systemd
-
-DESCRIPTION="Lightweight Kubernetes"
-HOMEPAGE="https://k3s.io"
-K3S_CONTAINERD_VERSION=1.5.13-k3s1
-K3S_RUNC_VERSION=v1.1.2
-K3S_ROOT_VERSION=0.11.0
-K3S_TRAEFIK_VERSION=10.19.3
-K3S_TRAEFIK_PACKAGE_VERSION=00
-K3S_CNIPLUGINS_VERSION=1.1.1
-CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN"
-
-MY_PV=${PV%_p*}+k3s${PV#*_p}
-SRC_URI="https://github.com/zmedico/k3s/archive/refs/tags/v${MY_PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
- ${EGO_SUM_SRC_URI}
- https://github.com/k3s-io/containerd/archive/refs/tags/v${K3S_CONTAINERD_VERSION}.tar.gz -> k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz
- https://github.com/opencontainers/runc/archive/refs/tags/${K3S_RUNC_VERSION}.tar.gz -> k3s-runc-${K3S_RUNC_VERSION}-r1.tar.gz
- https://helm.traefik.io/traefik/traefik-${K3S_TRAEFIK_VERSION}.tgz
- https://github.com/rancher/plugins/archive/refs/tags/v${K3S_CNIPLUGINS_VERSION}-k3s1.tar.gz -> k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz
- amd64? ( https://github.com/rancher/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar -> k3s-root-amd64-${K3S_ROOT_VERSION}.tar )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+kubectl-symlink rootless"
-REQUIRED_USE="|| ( amd64 )"
-DEPEND="
- app-misc/yq
- net-firewall/conntrack-tools
- sys-fs/btrfs-progs
- rootless? ( app-containers/slirp4netns )
-"
-RDEPEND="kubectl-symlink? ( !sys-cluster/kubectl )"
-RESTRICT+=" test"
-
-S=${WORKDIR}/${PN}-${MY_PV/+/-}-vendor
-
-src_unpack() {
- unpack ${P}-vendor.tar.gz
- cd "${S}" || die
- mkdir -p bin/aux build/static/charts cache etc || die
- cp "${DISTDIR}/traefik-${K3S_TRAEFIK_VERSION}.tgz" build/static/charts/traefik-${K3S_TRAEFIK_VERSION}${K3S_TRAEFIK_PACKAGE_VERSION}.tgz || die
- cp "${DISTDIR}/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz" cache/ || die
-}
-
-src_prepare() {
- local filename pattern replacement
- default
-
- local CONTAINERD_DIR=build/src/github.com/containerd/containerd
- mkdir -p "${CONTAINERD_DIR}" || die
- tar -x --strip-components=1 -f "${DISTDIR}/k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz" -C "${CONTAINERD_DIR}" || die
- if has_version -b ">=dev-lang/go-1.18"; then
- # https://bugs.gentoo.org/835601
- sed -i -e "/github.com\/containerd\/containerd => .\/.empty-mod/d" "${CONTAINERD_DIR}"/{go.mod,vendor/modules.txt} || die
- fi
-
- local RUNC_DIR=build/src/github.com/opencontainers/runc
- mkdir -p "${RUNC_DIR}" || die
- tar -x --strip-components=1 -f "${DISTDIR}/k3s-runc-${K3S_RUNC_VERSION}-r1.tar.gz" -C "${RUNC_DIR}" || die
-
- # Disable download for files fetched via SRC_URI.
- sed -e 's:^[[:space:]]*curl:#\0:' \
- -e 's:^[[:space:]]*git:#\0:' \
- -e 's:^rm -rf \${CHARTS_DIR}:#\0:' \
- -e 's:^rm -rf \${RUNC_DIR}:#\0:' \
- -e 's:^rm -rf \${CONTAINERD_DIR}:#\0:' \
- -e 's:yq e :yq -r :' \
- -e "s:^setup_tmp\$:TMP_DIR=${S}/build/static/charts:" \
- -i scripts/download || die
- sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die
- pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR'
- filename=scripts/build
- grep -qF "${pattern}" "${filename}" || \
- die "failed to locate plugins clone command"
- sed -e "s|${pattern}|mkdir -p \"\$WORKDIR\" \\&\\& tar -xzf \"${S}/cache/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz\" --strip-components=1 -C \"\$WORKDIR\"|" \
- -e 's|rm -rf $TMPDIR||' \
- -i "${filename}" || die
- sed -e 's:/usr/local/bin:/usr/bin:g' -i k3s.service || die
-}
-
-src_compile() {
- mkdir -p build/data || die
- "${BASH}" -ex ./scripts/download || die
- ./scripts/build || die
- ./scripts/package-cli || die
-}
-
-src_install() {
- dobin "dist/artifacts/${PN}"
- use kubectl-symlink && dosym k3s /usr/bin/kubectl
- systemd_dounit "${FILESDIR}/${PN}.service"
- newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${PN}"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotated" "${PN}"
- dodoc README.md
-}
diff --git a/sys-cluster/k3s/k3s-1.23.7_p1.ebuild b/sys-cluster/k3s/k3s-1.24.2_p2.ebuild
index 30e4c15b0893..e01a71ae45a5 100644
--- a/sys-cluster/k3s/k3s-1.23.7_p1.ebuild
+++ b/sys-cluster/k3s/k3s-1.24.2_p2.ebuild
@@ -6,7 +6,7 @@ inherit go-module linux-info systemd
DESCRIPTION="Lightweight Kubernetes"
HOMEPAGE="https://k3s.io"
-K3S_CONTAINERD_VERSION=1.5.13-k3s1
+K3S_CONTAINERD_VERSION=1.6.6-k3s1
K3S_RUNC_VERSION=v1.1.2
K3S_ROOT_VERSION=0.11.0
K3S_TRAEFIK_VERSION=10.19.3