[gentoo-commits] repo/gentoo:master commit in: sys-cluster/k3s/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/k3s/
Date: Sun, 24 Jul 2022 22:26:44 +0000 (UTC)	[thread overview]
Message-ID: <1658701601.f45e998016cf5f6b9b78412d2dab05c84063b960.zmedico@gentoo> (raw)

commit:     f45e998016cf5f6b9b78412d2dab05c84063b960
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 22:26:23 2022 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 22:26:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f45e9980

sys-cluster/k3s: add 1.24.3_p1

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 sys-cluster/k3s/Manifest             |   2 +
 sys-cluster/k3s/k3s-1.24.3_p1.ebuild | 102 +++++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)

diff --git a/sys-cluster/k3s/Manifest b/sys-cluster/k3s/Manifest
index 7d2dbdc1c989..e8c688d78e88 100644
--- a/sys-cluster/k3s/Manifest
+++ b/sys-cluster/k3s/Manifest
@@ -1,7 +1,9 @@
 DIST k3s-1.24.2_p1-vendor.tar.gz 31410828 BLAKE2B 410dc4de95201fb8654571c343458e458e17c52b2b1e2bcf2777df04a50ae54bb119fa88086ee61b7f569d905b0e58df12446c5bd145b46027930a57f5aa033a SHA512 ace54126bc47bc25bf2d2dc13c7ad085d2815d6303ab851ec8738aff5765b9e6f77e6a23fd41375999e03dd215d6b3d54d122d820559dd36dabd87e41ba95093
 DIST k3s-1.24.2_p2-vendor.tar.gz 31418274 BLAKE2B d0fb00c1419cf894eebb83b4f7d29f260628dd06a3a6376cf60257bcc0b571e743954013877e6e85de6b22eb643799a09bf79d898419383951270944ea0e6fe4 SHA512 d0dd6e9804e1e5f7abc9b9429bf0e208baa9da0ee405f7fc3b241e03f39a40284ad098cf1832ac3292f7ee12de66711f9cfc6b01a99ad97fb6653e6236badbb8
+DIST k3s-1.24.3_p1-vendor.tar.gz 31433160 BLAKE2B 33328690ac94c101fd02bc2ef166f09eb5b54a1404da9206a3ff7fdf3c212a2dea96563b6d1da9a25105a15f69cc71664e3d1cb6f35f18f18faae50a67607d80 SHA512 e742b01960a4dc35f80e923fc9fbf41ae2913a24b66de7acd8c8b7a78681cca55821adc5e42df527fc6a9c42146f8b39de85c1060e2981198cd6712dcf300231
 DIST k3s-cni-plugins-1.1.1.tar.gz 3122345 BLAKE2B 270283ffb746ca97ad147b368143c56bd9641b7ebcb1b2b61f80ffea3336b240b28c9b9496bd2f6eb6d7e5382da4979c26e37eca30ac19fd362ed822ba94f300 SHA512 53dcd363231325553a5c9e804fc9005471fe5c05c87aae0340214c146eba66a3761d73976ba0145d86a663a2b0a1941e6cc5823b6d05e002a9ef18e41e10ac3c
 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.1.2-r1.tar.gz 2332953 BLAKE2B e6047baa799e97d201630f5ff438ca8742ef4c9f465c3728fe2e4bd7f18a571172cb8f994c0e9ffba4f7ae75088626583602f49e0e9f4764c96157820c332b5b SHA512 61d8cc82f49e3bc1cf4cc4ae18a9d9c8f4ae93e8380ce6fa9034b154bd1b915339ee65babdf7518021d015a3c31545fcbad5bbf0c4579c7eb50988877121f049
+DIST k3s-runc-v1.1.3.tar.gz 2333384 BLAKE2B 7530faa80a6d51c840a1ea702ec59580a3e42514f5932a7dd4df9f80ff93245bde05accd572a942190b6be76316f38a408566b003ad380611376e73abe3cb5c0 SHA512 27fce2569d0dc710a0f90095957be30c29da24ce1d2b8e115b9dc11d36f5226d98c4b2d8b92ecfa7581eade90bc51c5d9bccaf15fcb2542dafebe4fabc6e1cd9
 DIST traefik-10.19.3.tgz 25287 BLAKE2B c43a5e066d78e066bc4449ad1d7a3796c99c5f029244dac5494a452592424a9be057b6a3d8eddd174d8daab2b322c4f54e39eae53fba67e97e1ebdb92ce2fd65 SHA512 6df4b186c4caad09abf47469757c1d26d3b593531704af53eb262208f1efa27b5b09b178c6dd6721e78362877e6ba3b2c8c3bfbc91fe152ce090b53ac283acf9

diff --git a/sys-cluster/k3s/k3s-1.24.3_p1.ebuild b/sys-cluster/k3s/k3s-1.24.3_p1.ebuild
new file mode 100644
index 000000000000..37d109813df1
--- /dev/null
+++ b/sys-cluster/k3s/k3s-1.24.3_p1.ebuild
@@ -0,0 +1,102 @@
+# 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.6.6-k3s1
+K3S_RUNC_VERSION=v1.1.3
+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}.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}.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
+}

next             reply	other threads:[~2022-07-24 22:26 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-24 22:26 Zac Medico [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-01-29 20:34 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/k3s/ William Hubbs
2022-12-11 21:13 Zac Medico
2022-11-19  1:03 Zac Medico
2022-10-26  0:17 Zac Medico
2022-10-10 15:51 Zac Medico
2022-09-30  1:33 Zac Medico
2022-09-30  1:33 Zac Medico
2022-09-14  2:30 Zac Medico
2022-08-26 20:30 Zac Medico
2022-08-26 20:30 Zac Medico
2022-07-10 17:35 Zac Medico
2022-07-10 17:35 Zac Medico
2022-07-02  1:05 Zac Medico
2022-06-12 22:50 Zac Medico
2022-06-12 22:32 Zac Medico
2022-06-12 22:10 Zac Medico
2022-04-30  1:59 Zac Medico
2022-04-01 17:43 Zac Medico
2022-03-19 18:01 Zac Medico
2022-03-19 17:27 Zac Medico
2022-02-26 20:22 Zac Medico
2022-02-21 21:06 Zac Medico
2022-02-16 22:09 Zac Medico
2022-01-31  1:25 Zac Medico
2022-01-16  0:20 Zac Medico
2022-01-10 14:29 Zac Medico
2022-01-09 22:38 Zac Medico
2021-12-19  2:48 Zac Medico
2021-12-19  2:47 Zac Medico
2021-12-19  1:33 Zac Medico
2021-12-19  1:04 Zac Medico
2021-12-11 21:09 Zac Medico
2021-11-04  7:03 Zac Medico
2021-11-04  6:31 Zac Medico
2021-11-04  5:35 Zac Medico
2021-11-04  5:07 Zac Medico
2021-10-13  3:37 Zac Medico
2021-10-13  3:33 Zac Medico
2021-10-13  3:33 Zac Medico
2021-10-13  3:33 Zac Medico
2021-10-12 21:05 Zac Medico
2021-10-12  7:16 Zac Medico
2021-10-12  6:53 Zac Medico
2021-10-12  5:55 Zac Medico
2021-10-12  5:52 Zac Medico
2021-10-12  5:21 Zac Medico
2021-10-12  4:35 Zac Medico
2021-10-05  4:05 Zac Medico
2021-05-10  5:57 Zac Medico
2021-05-02  8:57 Zac Medico
2021-05-02  7:19 Zac Medico
2021-05-02  6:25 Zac Medico

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:7d2dbdc1c98 dfblob:e8c688d78e8 dfblob:37d109813df )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sys-cluster/k3s/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1658701601.f45e998016cf5f6b9b78412d2dab05c84063b960.zmedico@gentoo \
    --to=zmedico@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox