1 |
commit: 5721487bdc24fd1b98d069848c868b461ab1e8fc |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 30 01:16:40 2022 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 30 01:33:20 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5721487b |
7 |
|
8 |
sys-cluster/k3s: drop 1.24.3_p1, 1.24.4_p1 |
9 |
|
10 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
11 |
|
12 |
sys-cluster/k3s/Manifest | 4 -- |
13 |
sys-cluster/k3s/k3s-1.24.3_p1.ebuild | 102 ----------------------------------- |
14 |
sys-cluster/k3s/k3s-1.24.4_p1.ebuild | 102 ----------------------------------- |
15 |
3 files changed, 208 deletions(-) |
16 |
|
17 |
diff --git a/sys-cluster/k3s/Manifest b/sys-cluster/k3s/Manifest |
18 |
index 2aae204293d7..77de7304e52d 100644 |
19 |
--- a/sys-cluster/k3s/Manifest |
20 |
+++ b/sys-cluster/k3s/Manifest |
21 |
@@ -1,10 +1,6 @@ |
22 |
-DIST k3s-1.24.3_p1-vendor.tar.gz 31433160 BLAKE2B 33328690ac94c101fd02bc2ef166f09eb5b54a1404da9206a3ff7fdf3c212a2dea96563b6d1da9a25105a15f69cc71664e3d1cb6f35f18f18faae50a67607d80 SHA512 e742b01960a4dc35f80e923fc9fbf41ae2913a24b66de7acd8c8b7a78681cca55821adc5e42df527fc6a9c42146f8b39de85c1060e2981198cd6712dcf300231 |
23 |
-DIST k3s-1.24.4_p1-vendor.tar.gz 31949072 BLAKE2B 60f152f7085039f061461e932a5ccada68404ff5a6de88602aeffd07141b825b441ea4a58d6fc5eb8b73bc8f02df81cb1c710fc8f05e1f6d8d8a1ecd4adf564b SHA512 3b27e3dc3834ba509e57f32b5cff68903cb8160d5b0b1c5dd753b66021c0fbd547f7df7d5cb8d3820e1fa0d495087eb98f6197ec29ff9127b713c6f9ab4f1710 |
24 |
DIST k3s-1.25.0_p1-vendor.tar.gz 31880481 BLAKE2B 6b45448119713374f7e796f35ba460a7f8fc351d2a146f1d47af96a7e5a3d67f24f48f9a6ce5643675122b0677b3db46e25af282f1ad1b99722b3fe2246fd078 SHA512 4cee72ce30ac14bbacc90d0d976f727e931dcd6f98a88b6a22da6635ce2977afa2db8eea779ff80bfdb91aeb5711ce560b9dc09b19fa5d10c9503bb52be0b24a |
25 |
DIST k3s-cni-plugins-1.1.1.tar.gz 3122345 BLAKE2B 270283ffb746ca97ad147b368143c56bd9641b7ebcb1b2b61f80ffea3336b240b28c9b9496bd2f6eb6d7e5382da4979c26e37eca30ac19fd362ed822ba94f300 SHA512 53dcd363231325553a5c9e804fc9005471fe5c05c87aae0340214c146eba66a3761d73976ba0145d86a663a2b0a1941e6cc5823b6d05e002a9ef18e41e10ac3c |
26 |
-DIST k3s-containerd-1.6.6-k3s1.tar.gz 10337871 BLAKE2B c4d038c2654243f61f907942a7ddc6d6584c50a04db3cd539f8cbb46901737744b39ca7c31ef51e84ba87faafbfa1962a36e2912a1bfee9d922e2f15e3253970 SHA512 11a2247ea8deb498fb8f0fbd90735d5c4e980d3744ddf1c17b1bf438379c55124a57838a27bc6df7a0b0421881d6072f0cd0bbb4c4835aa34ea894af02334fa8 |
27 |
DIST k3s-containerd-1.6.8-k3s1.tar.gz 10344676 BLAKE2B 18b236d61c710234fc6feefb4b08e36950c02a3a74d92a7bae5286ddf2916d29f636d1c9fb4307ccb6c6f1c7a77441096b0db9c892d5745f32815f4016af7b54 SHA512 b85c5e73c9f6c66c229888d93b3796c3fa4b362ee2ee4f7fb37f760ff241223820c0bec4995e73e9c3d20b81a8fc3676e7b0ed170239c8cb43194aae2701a6b5 |
28 |
DIST k3s-root-amd64-0.11.0.tar 11878400 BLAKE2B 6227ba08e305f062ed814a6b997313415c08e469b05f0501c86f7df25e8a3c9ecb43675613337f6d038faa5153aae98eb44cad9bc170967e0a216ba5ec27559e SHA512 d181117230ad941b40173c3b7dc3d2bb0f3d44a28e9715d85c752193c6058bb6be4a4b8f061df73fed690629a7b2b330185b38bb90ce7fcc9c808096516cb0a3 |
29 |
-DIST k3s-runc-v1.1.3.tar.gz 2333384 BLAKE2B 7530faa80a6d51c840a1ea702ec59580a3e42514f5932a7dd4df9f80ff93245bde05accd572a942190b6be76316f38a408566b003ad380611376e73abe3cb5c0 SHA512 27fce2569d0dc710a0f90095957be30c29da24ce1d2b8e115b9dc11d36f5226d98c4b2d8b92ecfa7581eade90bc51c5d9bccaf15fcb2542dafebe4fabc6e1cd9 |
30 |
DIST k3s-runc-v1.1.4.tar.gz 2334639 BLAKE2B bc7eb7de29e8ebb9ce146bc77bf6cfc116f4af3e28c0344059183cf0c8082c629ccb235531c368cce99915991b25df0b50b7cbb98b9c6a7d141ba6cc15958651 SHA512 c8e79ad839964680d29ab56a4de255f91192741951673025da6889c544a232d4d392db2da8005d8e22999a37bfbc9c9fe7f6043b165bc4edc2f2a29261d8a3d6 |
31 |
DIST traefik-10.19.3.tgz 25287 BLAKE2B c43a5e066d78e066bc4449ad1d7a3796c99c5f029244dac5494a452592424a9be057b6a3d8eddd174d8daab2b322c4f54e39eae53fba67e97e1ebdb92ce2fd65 SHA512 6df4b186c4caad09abf47469757c1d26d3b593531704af53eb262208f1efa27b5b09b178c6dd6721e78362877e6ba3b2c8c3bfbc91fe152ce090b53ac283acf9 |
32 |
|
33 |
diff --git a/sys-cluster/k3s/k3s-1.24.3_p1.ebuild b/sys-cluster/k3s/k3s-1.24.3_p1.ebuild |
34 |
deleted file mode 100644 |
35 |
index 37d109813df1..000000000000 |
36 |
--- a/sys-cluster/k3s/k3s-1.24.3_p1.ebuild |
37 |
+++ /dev/null |
38 |
@@ -1,102 +0,0 @@ |
39 |
-# Copyright 2021-2022 Gentoo Authors |
40 |
-# Distributed under the terms of the GNU General Public License v2 |
41 |
- |
42 |
-EAPI=7 |
43 |
-inherit go-module linux-info systemd |
44 |
- |
45 |
-DESCRIPTION="Lightweight Kubernetes" |
46 |
-HOMEPAGE="https://k3s.io" |
47 |
-K3S_CONTAINERD_VERSION=1.6.6-k3s1 |
48 |
-K3S_RUNC_VERSION=v1.1.3 |
49 |
-K3S_ROOT_VERSION=0.11.0 |
50 |
-K3S_TRAEFIK_VERSION=10.19.3 |
51 |
-K3S_TRAEFIK_PACKAGE_VERSION=00 |
52 |
-K3S_CNIPLUGINS_VERSION=1.1.1 |
53 |
-CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN" |
54 |
- |
55 |
-MY_PV=${PV%_p*}+k3s${PV#*_p} |
56 |
-SRC_URI="https://github.com/zmedico/k3s/archive/refs/tags/v${MY_PV}-vendor.tar.gz -> ${P}-vendor.tar.gz |
57 |
- ${EGO_SUM_SRC_URI} |
58 |
- https://github.com/k3s-io/containerd/archive/refs/tags/v${K3S_CONTAINERD_VERSION}.tar.gz -> k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz |
59 |
- https://github.com/opencontainers/runc/archive/refs/tags/${K3S_RUNC_VERSION}.tar.gz -> k3s-runc-${K3S_RUNC_VERSION}.tar.gz |
60 |
- https://helm.traefik.io/traefik/traefik-${K3S_TRAEFIK_VERSION}.tgz |
61 |
- https://github.com/rancher/plugins/archive/refs/tags/v${K3S_CNIPLUGINS_VERSION}-k3s1.tar.gz -> k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz |
62 |
- amd64? ( https://github.com/rancher/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar -> k3s-root-amd64-${K3S_ROOT_VERSION}.tar )" |
63 |
- |
64 |
-LICENSE="Apache-2.0" |
65 |
-SLOT="0" |
66 |
-KEYWORDS="~amd64" |
67 |
-IUSE="+kubectl-symlink rootless" |
68 |
-REQUIRED_USE="|| ( amd64 )" |
69 |
-DEPEND=" |
70 |
- app-misc/yq |
71 |
- net-firewall/conntrack-tools |
72 |
- sys-fs/btrfs-progs |
73 |
- rootless? ( app-containers/slirp4netns ) |
74 |
-" |
75 |
-RDEPEND="kubectl-symlink? ( !sys-cluster/kubectl )" |
76 |
-RESTRICT+=" test" |
77 |
- |
78 |
-S=${WORKDIR}/${PN}-${MY_PV/+/-}-vendor |
79 |
- |
80 |
-src_unpack() { |
81 |
- unpack ${P}-vendor.tar.gz |
82 |
- cd "${S}" || die |
83 |
- mkdir -p bin/aux build/static/charts cache etc || die |
84 |
- cp "${DISTDIR}/traefik-${K3S_TRAEFIK_VERSION}.tgz" build/static/charts/traefik-${K3S_TRAEFIK_VERSION}${K3S_TRAEFIK_PACKAGE_VERSION}.tgz || die |
85 |
- cp "${DISTDIR}/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz" cache/ || die |
86 |
-} |
87 |
- |
88 |
-src_prepare() { |
89 |
- local filename pattern replacement |
90 |
- default |
91 |
- |
92 |
- local CONTAINERD_DIR=build/src/github.com/containerd/containerd |
93 |
- mkdir -p "${CONTAINERD_DIR}" || die |
94 |
- tar -x --strip-components=1 -f "${DISTDIR}/k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz" -C "${CONTAINERD_DIR}" || die |
95 |
- if has_version -b ">=dev-lang/go-1.18"; then |
96 |
- # https://bugs.gentoo.org/835601 |
97 |
- sed -i -e "/github.com\/containerd\/containerd => .\/.empty-mod/d" "${CONTAINERD_DIR}"/{go.mod,vendor/modules.txt} || die |
98 |
- fi |
99 |
- |
100 |
- local RUNC_DIR=build/src/github.com/opencontainers/runc |
101 |
- mkdir -p "${RUNC_DIR}" || die |
102 |
- tar -x --strip-components=1 -f "${DISTDIR}/k3s-runc-${K3S_RUNC_VERSION}.tar.gz" -C "${RUNC_DIR}" || die |
103 |
- |
104 |
- # Disable download for files fetched via SRC_URI. |
105 |
- sed -e 's:^[[:space:]]*curl:#\0:' \ |
106 |
- -e 's:^[[:space:]]*git:#\0:' \ |
107 |
- -e 's:^rm -rf \${CHARTS_DIR}:#\0:' \ |
108 |
- -e 's:^rm -rf \${RUNC_DIR}:#\0:' \ |
109 |
- -e 's:^rm -rf \${CONTAINERD_DIR}:#\0:' \ |
110 |
- -e 's:yq e :yq -r :' \ |
111 |
- -e "s:^setup_tmp\$:TMP_DIR=${S}/build/static/charts:" \ |
112 |
- -i scripts/download || die |
113 |
- sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die |
114 |
- pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR' |
115 |
- filename=scripts/build |
116 |
- grep -qF "${pattern}" "${filename}" || \ |
117 |
- die "failed to locate plugins clone command" |
118 |
- sed -e "s|${pattern}|mkdir -p \"\$WORKDIR\" \\&\\& tar -xzf \"${S}/cache/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz\" --strip-components=1 -C \"\$WORKDIR\"|" \ |
119 |
- -e 's|rm -rf $TMPDIR||' \ |
120 |
- -i "${filename}" || die |
121 |
- sed -e 's:/usr/local/bin:/usr/bin:g' -i k3s.service || die |
122 |
-} |
123 |
- |
124 |
-src_compile() { |
125 |
- mkdir -p build/data || die |
126 |
- "${BASH}" -ex ./scripts/download || die |
127 |
- ./scripts/build || die |
128 |
- ./scripts/package-cli || die |
129 |
-} |
130 |
- |
131 |
-src_install() { |
132 |
- dobin "dist/artifacts/${PN}" |
133 |
- use kubectl-symlink && dosym k3s /usr/bin/kubectl |
134 |
- systemd_dounit "${FILESDIR}/${PN}.service" |
135 |
- newinitd "${FILESDIR}/${PN}.initd" "${PN}" |
136 |
- newconfd "${FILESDIR}/${PN}.confd" "${PN}" |
137 |
- insinto /etc/logrotate.d |
138 |
- newins "${FILESDIR}/${PN}.logrotated" "${PN}" |
139 |
- dodoc README.md |
140 |
-} |
141 |
|
142 |
diff --git a/sys-cluster/k3s/k3s-1.24.4_p1.ebuild b/sys-cluster/k3s/k3s-1.24.4_p1.ebuild |
143 |
deleted file mode 100644 |
144 |
index 37d109813df1..000000000000 |
145 |
--- a/sys-cluster/k3s/k3s-1.24.4_p1.ebuild |
146 |
+++ /dev/null |
147 |
@@ -1,102 +0,0 @@ |
148 |
-# Copyright 2021-2022 Gentoo Authors |
149 |
-# Distributed under the terms of the GNU General Public License v2 |
150 |
- |
151 |
-EAPI=7 |
152 |
-inherit go-module linux-info systemd |
153 |
- |
154 |
-DESCRIPTION="Lightweight Kubernetes" |
155 |
-HOMEPAGE="https://k3s.io" |
156 |
-K3S_CONTAINERD_VERSION=1.6.6-k3s1 |
157 |
-K3S_RUNC_VERSION=v1.1.3 |
158 |
-K3S_ROOT_VERSION=0.11.0 |
159 |
-K3S_TRAEFIK_VERSION=10.19.3 |
160 |
-K3S_TRAEFIK_PACKAGE_VERSION=00 |
161 |
-K3S_CNIPLUGINS_VERSION=1.1.1 |
162 |
-CONFIG_CHECK="~BRIDGE_NETFILTER ~CFS_BANDWIDTH ~CGROUP_DEVICE ~CGROUP_PERF ~CGROUP_PIDS ~IP_VS ~MEMCG ~NETFILTER_XT_MATCH_COMMENT ~OVERLAY_FS ~VLAN_8021Q ~VXLAN" |
163 |
- |
164 |
-MY_PV=${PV%_p*}+k3s${PV#*_p} |
165 |
-SRC_URI="https://github.com/zmedico/k3s/archive/refs/tags/v${MY_PV}-vendor.tar.gz -> ${P}-vendor.tar.gz |
166 |
- ${EGO_SUM_SRC_URI} |
167 |
- https://github.com/k3s-io/containerd/archive/refs/tags/v${K3S_CONTAINERD_VERSION}.tar.gz -> k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz |
168 |
- https://github.com/opencontainers/runc/archive/refs/tags/${K3S_RUNC_VERSION}.tar.gz -> k3s-runc-${K3S_RUNC_VERSION}.tar.gz |
169 |
- https://helm.traefik.io/traefik/traefik-${K3S_TRAEFIK_VERSION}.tgz |
170 |
- https://github.com/rancher/plugins/archive/refs/tags/v${K3S_CNIPLUGINS_VERSION}-k3s1.tar.gz -> k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz |
171 |
- amd64? ( https://github.com/rancher/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar -> k3s-root-amd64-${K3S_ROOT_VERSION}.tar )" |
172 |
- |
173 |
-LICENSE="Apache-2.0" |
174 |
-SLOT="0" |
175 |
-KEYWORDS="~amd64" |
176 |
-IUSE="+kubectl-symlink rootless" |
177 |
-REQUIRED_USE="|| ( amd64 )" |
178 |
-DEPEND=" |
179 |
- app-misc/yq |
180 |
- net-firewall/conntrack-tools |
181 |
- sys-fs/btrfs-progs |
182 |
- rootless? ( app-containers/slirp4netns ) |
183 |
-" |
184 |
-RDEPEND="kubectl-symlink? ( !sys-cluster/kubectl )" |
185 |
-RESTRICT+=" test" |
186 |
- |
187 |
-S=${WORKDIR}/${PN}-${MY_PV/+/-}-vendor |
188 |
- |
189 |
-src_unpack() { |
190 |
- unpack ${P}-vendor.tar.gz |
191 |
- cd "${S}" || die |
192 |
- mkdir -p bin/aux build/static/charts cache etc || die |
193 |
- cp "${DISTDIR}/traefik-${K3S_TRAEFIK_VERSION}.tgz" build/static/charts/traefik-${K3S_TRAEFIK_VERSION}${K3S_TRAEFIK_PACKAGE_VERSION}.tgz || die |
194 |
- cp "${DISTDIR}/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz" cache/ || die |
195 |
-} |
196 |
- |
197 |
-src_prepare() { |
198 |
- local filename pattern replacement |
199 |
- default |
200 |
- |
201 |
- local CONTAINERD_DIR=build/src/github.com/containerd/containerd |
202 |
- mkdir -p "${CONTAINERD_DIR}" || die |
203 |
- tar -x --strip-components=1 -f "${DISTDIR}/k3s-containerd-${K3S_CONTAINERD_VERSION}.tar.gz" -C "${CONTAINERD_DIR}" || die |
204 |
- if has_version -b ">=dev-lang/go-1.18"; then |
205 |
- # https://bugs.gentoo.org/835601 |
206 |
- sed -i -e "/github.com\/containerd\/containerd => .\/.empty-mod/d" "${CONTAINERD_DIR}"/{go.mod,vendor/modules.txt} || die |
207 |
- fi |
208 |
- |
209 |
- local RUNC_DIR=build/src/github.com/opencontainers/runc |
210 |
- mkdir -p "${RUNC_DIR}" || die |
211 |
- tar -x --strip-components=1 -f "${DISTDIR}/k3s-runc-${K3S_RUNC_VERSION}.tar.gz" -C "${RUNC_DIR}" || die |
212 |
- |
213 |
- # Disable download for files fetched via SRC_URI. |
214 |
- sed -e 's:^[[:space:]]*curl:#\0:' \ |
215 |
- -e 's:^[[:space:]]*git:#\0:' \ |
216 |
- -e 's:^rm -rf \${CHARTS_DIR}:#\0:' \ |
217 |
- -e 's:^rm -rf \${RUNC_DIR}:#\0:' \ |
218 |
- -e 's:^rm -rf \${CONTAINERD_DIR}:#\0:' \ |
219 |
- -e 's:yq e :yq -r :' \ |
220 |
- -e "s:^setup_tmp\$:TMP_DIR=${S}/build/static/charts:" \ |
221 |
- -i scripts/download || die |
222 |
- sed -e '/scripts\/build-upload/d' -i scripts/package-cli || die |
223 |
- pattern='git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR' |
224 |
- filename=scripts/build |
225 |
- grep -qF "${pattern}" "${filename}" || \ |
226 |
- die "failed to locate plugins clone command" |
227 |
- sed -e "s|${pattern}|mkdir -p \"\$WORKDIR\" \\&\\& tar -xzf \"${S}/cache/k3s-cni-plugins-${K3S_CNIPLUGINS_VERSION}.tar.gz\" --strip-components=1 -C \"\$WORKDIR\"|" \ |
228 |
- -e 's|rm -rf $TMPDIR||' \ |
229 |
- -i "${filename}" || die |
230 |
- sed -e 's:/usr/local/bin:/usr/bin:g' -i k3s.service || die |
231 |
-} |
232 |
- |
233 |
-src_compile() { |
234 |
- mkdir -p build/data || die |
235 |
- "${BASH}" -ex ./scripts/download || die |
236 |
- ./scripts/build || die |
237 |
- ./scripts/package-cli || die |
238 |
-} |
239 |
- |
240 |
-src_install() { |
241 |
- dobin "dist/artifacts/${PN}" |
242 |
- use kubectl-symlink && dosym k3s /usr/bin/kubectl |
243 |
- systemd_dounit "${FILESDIR}/${PN}.service" |
244 |
- newinitd "${FILESDIR}/${PN}.initd" "${PN}" |
245 |
- newconfd "${FILESDIR}/${PN}.confd" "${PN}" |
246 |
- insinto /etc/logrotate.d |
247 |
- newins "${FILESDIR}/${PN}.logrotated" "${PN}" |
248 |
- dodoc README.md |
249 |
-} |