Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/k3s/
Date: Fri, 01 Apr 2022 17:43:24
Message-Id: 1648834989.3935e660e1a99d0ac98af8afa1c2f760c8118ef2.zmedico@gentoo
1 commit: 3935e660e1a99d0ac98af8afa1c2f760c8118ef2
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 1 17:42:37 2022 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 1 17:43:09 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3935e660
7
8 sys-cluster/k3s: add 1.23.5_p1
9
10 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
11
12 sys-cluster/k3s/Manifest | 2 +
13 sys-cluster/k3s/k3s-1.23.5_p1.ebuild | 102 +++++++++++++++++++++++++++++++++++
14 2 files changed, 104 insertions(+)
15
16 diff --git a/sys-cluster/k3s/Manifest b/sys-cluster/k3s/Manifest
17 index 249ab7281493..90354cfcb515 100644
18 --- a/sys-cluster/k3s/Manifest
19 +++ b/sys-cluster/k3s/Manifest
20 @@ -1,5 +1,7 @@
21 DIST k3s-1.23.4_p1-vendor.tar.gz 29494135 BLAKE2B 8e8598f43255b105e14b59ec54e7d3b19c4d8c10f61287a7e138153030b728cf41c7b9ad3d8300f7209a96421b7f934ed3a3ca63baac48babb376af664248536 SHA512 b2f98be943c6c4eedabc29e8703653fd78abf880eff306076d2e64a4756829adc848b1e48a735662a9264de94b2c86abff029c7a284c37c322bfa7537e35064b
22 +DIST k3s-1.23.5_p1-vendor.tar.gz 30890421 BLAKE2B eb9b26e40ad07e7ff250c0add216507bf536a561b2295f35f22855d3d93d7034d002526585563428762f801ec44dc32229a65afb2c9e68cb953174b29c98ea29 SHA512 837fd725a5ba9d7714935e83d10187b416f1cd6e7a97728833a3d44c6b5ce1bb2d56a80551474ec0e0b78230e2ff085ec1b643e8c9522d85d5c99f0d750ed6d1
23 DIST k3s-cni-plugins-1.0.1.tar.gz 5711129 BLAKE2B d75557a10de1dccd79b1953c167b0054c229a9cade891b87ece0133be4660fde5c442f253cec8938db87886fc6c39d5a68214262c9ec5c3266a1321ebb75bee7 SHA512 dff27fa602e948ab51745151614713262bc25dfe687a0f3e8b7bab4aa63d40e5e5cfa652e34455fea3f1f38558c3f648aa6021f134d78b4b49e7764f8e894d07
24 +DIST k3s-containerd-1.5.10-k3s1.tar.gz 9903838 BLAKE2B b188b29d2e0bea30431b9b2ddc3aa1b3e432f283f3af4b125497ba4d7df7559ecf50e197508fb068c04491adeb6831f3758755d497206572527c2ea3cc2c3cfe SHA512 950b72955cd3aff78a232c217517bc945601a289ab636ca79c6bdaf2768f26e86f46fab7020396b21dbae37acfeec499db801f651eccb581789ca90a991987ab
25 DIST k3s-containerd-1.5.9-k3s1.tar.gz 9800317 BLAKE2B 95129dbf41ff9c88dc44e6aea791b0f8010116d57142bc0a7079fa6bd9f4ac1f83ce35d1a7baa2848bf6d4640362f95ec5ee8198dc3d2feee3e0648313fc2eeb SHA512 f312246f98b27b92ffea962678b9175da2b18ed26cd70d8b7bc90f39ade0a8c21591953662a57a5358527654b4046c95ea9af52fea03edd6becd90ec3a9b6abe
26 DIST k3s-root-amd64-0.11.0.tar 11878400 BLAKE2B 6227ba08e305f062ed814a6b997313415c08e469b05f0501c86f7df25e8a3c9ecb43675613337f6d038faa5153aae98eb44cad9bc170967e0a216ba5ec27559e SHA512 d181117230ad941b40173c3b7dc3d2bb0f3d44a28e9715d85c752193c6058bb6be4a4b8f061df73fed690629a7b2b330185b38bb90ce7fcc9c808096516cb0a3
27 DIST k3s-runc-v1.0.3-r1.tar.gz 2375241 BLAKE2B 0fb9368ab5442462001c15a67a71821133ad90d16cac5aac760e52b2477db69c0a5dd59df42601119b19ede508889796c994a24624f88ec6a1a29dad19e0bf33 SHA512 64a1894c2b4ed5a68b185e88548fc9fbbd01d8a9495feed59fb196aa06763d64cfb71ca6cbc09d1defa26a0d94ad58626296585741f23df2e290147ba6c4c26e
28
29 diff --git a/sys-cluster/k3s/k3s-1.23.5_p1.ebuild b/sys-cluster/k3s/k3s-1.23.5_p1.ebuild
30 new file mode 100644
31 index 000000000000..42c006047f9c
32 --- /dev/null
33 +++ b/sys-cluster/k3s/k3s-1.23.5_p1.ebuild
34 @@ -0,0 +1,102 @@
35 +# Copyright 2021-2022 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=7
39 +inherit go-module linux-info systemd
40 +
41 +DESCRIPTION="Lightweight Kubernetes"
42 +HOMEPAGE="https://k3s.io"
43 +K3S_CONTAINERD_VERSION=1.5.10-k3s1
44 +K3S_RUNC_VERSION=v1.0.3
45 +K3S_ROOT_VERSION=0.11.0
46 +K3S_TRAEFIK_VERSION=10.14.1
47 +K3S_TRAEFIK_PACKAGE_VERSION=00
48 +K3S_CNIPLUGINS_VERSION=1.0.1
49 +CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN"
50 +
51 +MY_PV=${PV%_p*}+k3s${PV#*_p}
52 +SRC_URI="https://github.com/zmedico/k3s/archive/refs/tags/v${MY_PV}-vendor.tar.gz -> ${P}-vendor.tar.gz
53 + ${EGO_SUM_SRC_URI}
54 + https://github.com/k3s-io/containerd/archive/refs/tags/v${K3S_CONTAINERD_VERSION}.tar.gz -> k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz
55 + https://github.com/opencontainers/runc/archive/refs/tags/${K3S_RUNC_VERSION}.tar.gz -> k3s-runc-${K3S_RUNC_VERSION}-r1.tar.gz
56 + https://helm.traefik.io/traefik/traefik-${K3S_TRAEFIK_VERSION}.tgz
57 + https://github.com/rancher/plugins/archive/refs/tags/v${K3S_CNIPLUGINS_VERSION}-k3s1.tar.gz -> k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz
58 + amd64? ( https://github.com/rancher/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar -> k3s-root-amd64-${K3S_ROOT_VERSION}.tar )"
59 +
60 +LICENSE="Apache-2.0"
61 +SLOT="0"
62 +KEYWORDS="~amd64"
63 +IUSE="+kubectl-symlink rootless"
64 +REQUIRED_USE="|| ( amd64 )"
65 +DEPEND="
66 + app-misc/yq
67 + net-firewall/conntrack-tools
68 + sys-fs/btrfs-progs
69 + rootless? ( app-containers/slirp4netns )
70 +"
71 +RDEPEND="kubectl-symlink? ( !sys-cluster/kubectl )"
72 +RESTRICT+=" test"
73 +
74 +S=${WORKDIR}/${PN}-${MY_PV/+/-}-vendor
75 +
76 +src_unpack() {
77 + unpack ${P}-vendor.tar.gz
78 + cd "${S}" || die
79 + mkdir -p bin/aux build/static/charts cache etc || die
80 + cp "${DISTDIR}/traefik-${K3S_TRAEFIK_VERSION}.tgz" build/static/charts/traefik-${K3S_TRAEFIK_VERSION}${K3S_TRAEFIK_PACKAGE_VERSION}.tgz || die
81 + cp "${DISTDIR}/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz" cache/ || die
82 +}
83 +
84 +src_prepare() {
85 + local filename pattern replacement
86 + default
87 +
88 + local CONTAINERD_DIR=build/src/github.com/containerd/containerd
89 + mkdir -p "${CONTAINERD_DIR}" || die
90 + tar -x --strip-components=1 -f "${DISTDIR}/k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz" -C "${CONTAINERD_DIR}" || die
91 + if has_version -b ">=dev-lang/go-1.18"; then
92 + # https://bugs.gentoo.org/835601
93 + sed -i -e "/github.com\/containerd\/containerd => .\/.empty-mod/d" "${CONTAINERD_DIR}"/{go.mod,vendor/modules.txt} || die
94 + fi
95 +
96 + local RUNC_DIR=build/src/github.com/opencontainers/runc
97 + mkdir -p "${RUNC_DIR}" || die
98 + tar -x --strip-components=1 -f "${DISTDIR}/k3s-runc-${K3S_RUNC_VERSION}-r1.tar.gz" -C "${RUNC_DIR}" || die
99 +
100 + # Disable download for files fetched via SRC_URI.
101 + sed -e 's:^[[:space:]]*curl:#\0:' \
102 + -e 's:^[[:space:]]*git:#\0:' \
103 + -e 's:^rm -rf \${CHARTS_DIR}:#\0:' \
104 + -e 's:^rm -rf \${RUNC_DIR}:#\0:' \
105 + -e 's:^rm -rf \${CONTAINERD_DIR}:#\0:' \
106 + -e 's:yq e :yq -r :' \
107 + -e "s:^setup_tmp\$:TMP_DIR=${S}/build/static/charts:" \
108 + -i scripts/download || die
109 + sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die
110 + pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR'
111 + filename=scripts/build
112 + grep -qF "${pattern}" "${filename}" || \
113 + die "failed to locate plugins clone command"
114 + sed -e "s|${pattern}|mkdir -p \"\$WORKDIR\" \\&\\& tar -xzf \"${S}/cache/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz\" --strip-components=1 -C \"\$WORKDIR\"|" \
115 + -e 's|rm -rf $TMPDIR||' \
116 + -i "${filename}" || die
117 + sed -e 's:/usr/local/bin:/usr/bin:g' -i k3s.service || die
118 +}
119 +
120 +src_compile() {
121 + mkdir -p build/data || die
122 + "${BASH}" -ex ./scripts/download || die
123 + ./scripts/build || die
124 + ./scripts/package-cli || die
125 +}
126 +
127 +src_install() {
128 + dobin "dist/artifacts/${PN}"
129 + use kubectl-symlink && dosym k3s /usr/bin/kubectl
130 + systemd_dounit "${FILESDIR}/${PN}.service"
131 + newinitd "${FILESDIR}/${PN}.initd" "${PN}"
132 + newconfd "${FILESDIR}/${PN}.confd" "${PN}"
133 + insinto /etc/logrotate.d
134 + newins "${FILESDIR}/${PN}.logrotated" "${PN}"
135 + dodoc README.md
136 +}