commit: 7453fed22fb90a33751a1a62f1ee40a0eef1947e Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Wed Feb 19 19:33:07 2025 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Wed Feb 19 19:34:07 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7453fed2
sys-cluster/k3s: treeclean Closes: https://bugs.gentoo.org/896044 (pkgremoved) Closes: https://bugs.gentoo.org/939503 (pkgremoved) Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> profiles/package.mask | 5 -- sys-cluster/k3s/Manifest | 6 --- sys-cluster/k3s/files/k3s-killall.sh | 78 --------------------------- sys-cluster/k3s/files/k3s.confd | 2 - sys-cluster/k3s/files/k3s.initd | 32 ----------- sys-cluster/k3s/files/k3s.logrotated | 3 -- sys-cluster/k3s/files/k3s.service | 24 --------- sys-cluster/k3s/k3s-1.25.4_p1.ebuild | 102 ----------------------------------- sys-cluster/k3s/metadata.xml | 19 ------- 9 files changed, 271 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 305209f34e47..1793e82e9ff9 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -278,11 +278,6 @@ dev-qt/qtserialbus:5 dev-qt/qtvirtualkeyboard:5 dev-qt/qtwebview:5 -# Zac Medico <zmed...@gentoo.org> (2025-01-18) -# Ebuild is difficult to maintain. No revdeps. -# Removal on 2025-02-17. Bug #896044 -sys-cluster/k3s - # Conrad Kostecki <conik...@gentoo.org> (2025-01-09) # New version, which dropps support for legacy devices. # Will be unmasked, when split to legacy-branch is done. diff --git a/sys-cluster/k3s/Manifest b/sys-cluster/k3s/Manifest deleted file mode 100644 index ed6c96cedae1..000000000000 --- a/sys-cluster/k3s/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -DIST k3s-1.25.4_p1-vendor.tar.gz 32048804 BLAKE2B 0fabf00e32b7db9f607def3a6d67b8266e96816f108be89bef499859219ca2ed26c7c4e01c2795161d8513b7c8cd55f9b6ea38f28b8536b3510fe59c86115d4f SHA512 96c157f4cb57347b3f6ac8be345fc4937aae2679b321387c263550f63b893f888df099de27606a81feaead1a8a3a3b54ed0974556666fcfe6390ddcee653a5ea -DIST k3s-cni-plugins-1.1.1.tar.gz 3122345 BLAKE2B 270283ffb746ca97ad147b368143c56bd9641b7ebcb1b2b61f80ffea3336b240b28c9b9496bd2f6eb6d7e5382da4979c26e37eca30ac19fd362ed822ba94f300 SHA512 53dcd363231325553a5c9e804fc9005471fe5c05c87aae0340214c146eba66a3761d73976ba0145d86a663a2b0a1941e6cc5823b6d05e002a9ef18e41e10ac3c -DIST k3s-containerd-1.6.8-k3s1.tar.gz 10344676 BLAKE2B 18b236d61c710234fc6feefb4b08e36950c02a3a74d92a7bae5286ddf2916d29f636d1c9fb4307ccb6c6f1c7a77441096b0db9c892d5745f32815f4016af7b54 SHA512 b85c5e73c9f6c66c229888d93b3796c3fa4b362ee2ee4f7fb37f760ff241223820c0bec4995e73e9c3d20b81a8fc3676e7b0ed170239c8cb43194aae2701a6b5 -DIST k3s-root-amd64-0.11.0.tar 11878400 BLAKE2B 6227ba08e305f062ed814a6b997313415c08e469b05f0501c86f7df25e8a3c9ecb43675613337f6d038faa5153aae98eb44cad9bc170967e0a216ba5ec27559e SHA512 d181117230ad941b40173c3b7dc3d2bb0f3d44a28e9715d85c752193c6058bb6be4a4b8f061df73fed690629a7b2b330185b38bb90ce7fcc9c808096516cb0a3 -DIST k3s-runc-v1.1.4.tar.gz 2334639 BLAKE2B bc7eb7de29e8ebb9ce146bc77bf6cfc116f4af3e28c0344059183cf0c8082c629ccb235531c368cce99915991b25df0b50b7cbb98b9c6a7d141ba6cc15958651 SHA512 c8e79ad839964680d29ab56a4de255f91192741951673025da6889c544a232d4d392db2da8005d8e22999a37bfbc9c9fe7f6043b165bc4edc2f2a29261d8a3d6 -DIST traefik-19.0.4.tgz 64237 BLAKE2B f9cb2ab1b72446781dc0b214b9f986629e78134ee3942ebc62d6bec43b15e1ce9dc34b8bdecfe04d198308f6fe7145e4bfcd4b6386fae50eb4bdce56751e7dc3 SHA512 575bd49371a91a0b00247ce1f72b7b87adad3d0dbfe31b4e916ca35711eb8ec39cb07bc903d2d7e44dc0f4f963303fc9169fe80c0c38f7191b13b655740b814b diff --git a/sys-cluster/k3s/files/k3s-killall.sh b/sys-cluster/k3s/files/k3s-killall.sh deleted file mode 100644 index a3aa2fcf3770..000000000000 --- a/sys-cluster/k3s/files/k3s-killall.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh -[ $(id -u) -eq 0 ] || exec sudo $0 $@ - -for bin in /var/lib/rancher/k3s/data/**/bin/; do - [ -d $bin ] && export PATH=$PATH:$bin:$bin/aux -done - -set -x - -for service in /etc/systemd/system/k3s*.service; do - [ -s $service ] && systemctl stop $(basename $service) -done - -for service in /etc/init.d/k3s*; do - [ -x $service ] && $service stop -done - -pschildren() { - ps -e -o ppid= -o pid= | \ - sed -e 's/^\s*//g; s/\s\s*/\t/g;' | \ - grep -w "^$1" | \ - cut -f2 -} - -pstree() { - for pid in $@; do - echo $pid - for child in $(pschildren $pid); do - pstree $child - done - done -} - -killtree() { - kill -9 $( - { set +x; } 2>/dev/null; - pstree $@; - set -x; - ) 2>/dev/null -} - -getshims() { - ps -e -o pid= -o args= | sed -e 's/^ *//; s/\s\s*/\t/;' | grep -w 'k3s/data/[^/]*/bin/containerd-shim' | cut -f1 -} - -killtree $({ set +x; } 2>/dev/null; getshims; set -x) - -do_unmount_and_remove() { - set +x - while read -r _ path _; do - case "$path" in $1*) echo "$path" ;; esac - done < /proc/self/mounts | sort -r | xargs -r -t -n 1 sh -c 'umount "$0" && rm -rf "$0"' - set -x -} - -do_unmount_and_remove '/run/k3s' -do_unmount_and_remove '/var/lib/rancher/k3s' -do_unmount_and_remove '/var/lib/kubelet/pods' -do_unmount_and_remove '/var/lib/kubelet/plugins' -do_unmount_and_remove '/run/netns/cni-' - -# Remove CNI namespaces -ip netns show 2>/dev/null | grep cni- | xargs -r -t -n 1 ip netns delete - -# Delete network interface(s) that match 'master cni0' -ip link show 2>/dev/null | grep 'master cni0' | while read ignore iface ignore; do - iface=${iface%%@*} - [ -z "$iface" ] || ip link delete $iface -done -ip link delete cni0 -ip link delete flannel.1 -ip link delete flannel-v6.1 -ip link delete kube-ipvs0 -ip link delete flannel-wg -ip link delete flannel-wg-v6 -rm -rf /var/lib/cni/ -iptables-save | grep -v KUBE- | grep -v CNI- | grep -iv flannel | iptables-restore -ip6tables-save | grep -v KUBE- | grep -v CNI- | grep -iv flannel | ip6tables-restore diff --git a/sys-cluster/k3s/files/k3s.confd b/sys-cluster/k3s/files/k3s.confd deleted file mode 100644 index e6b4067854c1..000000000000 --- a/sys-cluster/k3s/files/k3s.confd +++ /dev/null @@ -1,2 +0,0 @@ -#command_args="server" -#command_user="root:root" diff --git a/sys-cluster/k3s/files/k3s.initd b/sys-cluster/k3s/files/k3s.initd deleted file mode 100644 index 874052701a7d..000000000000 --- a/sys-cluster/k3s/files/k3s.initd +++ /dev/null @@ -1,32 +0,0 @@ -#!/sbin/openrc-run - -name=k3s -description="Lightweight Kubernetes" -pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"} -command="/usr/bin/k3s" -command_user="${command_user:-"root:root"}" -command_args="${command_args:-"server"}" -command_background="true" -output_log="${output_log:-"/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"}" -error_log="${error_log:-"${output_log}"}" -start_stop_daemon_args="${start_stop_daemon_args:-"--user ${command_user%:*} --group ${command_user#*:} --stdout ${output_log} --stderr ${error_log}"}" - -: "${supervisor:=supervise-daemon}" -: "${respawn_delay:=5}" -: "${respawn_max:=0}" - -depend() { - after network-online - want cgroups -} - -start() { - checkpath --directory --mode 755 --owner root "${pidfile%/*}" - checkpath --directory --mode 755 --owner "${command_user}" "${output_log%/*}" - default_start -} - -set -o allexport -if [ -f /etc/environment ]; then . /etc/environment; fi -if [ -f /etc/rancher/k3s/k3s.env ]; then . /etc/rancher/k3s/k3s.env; fi -set +o allexport diff --git a/sys-cluster/k3s/files/k3s.logrotated b/sys-cluster/k3s/files/k3s.logrotated deleted file mode 100644 index 87b8a16c73a6..000000000000 --- a/sys-cluster/k3s/files/k3s.logrotated +++ /dev/null @@ -1,3 +0,0 @@ -/var/log/k3s/*.log { - copytruncate -} diff --git a/sys-cluster/k3s/files/k3s.service b/sys-cluster/k3s/files/k3s.service deleted file mode 100644 index 3dfe301f7033..000000000000 --- a/sys-cluster/k3s/files/k3s.service +++ /dev/null @@ -1,24 +0,0 @@ -[Unit] -Description=Lightweight Kubernetes -Documentation=https://k3s.io -Wants=network-online.target - -[Install] -WantedBy=multi-user.target - -[Service] -Type=notify -EnvironmentFile=-/etc/systemd/system/k3s.service.env -Environment=CMD_K3S_EXEC="server" -KillMode=process -Delegate=yes -# Having non-zero Limit*s causes performance problems due to accounting overhead -# in the kernel. We recommend using cgroups to do container-local accounting. -LimitNOFILE=1048576 -LimitNPROC=infinity -LimitCORE=infinity -TasksMax=infinity -TimeoutStartSec=0 -Restart=always -RestartSec=5s -ExecStart=/usr/bin/k3s $CMD_K3S_EXEC diff --git a/sys-cluster/k3s/k3s-1.25.4_p1.ebuild b/sys-cluster/k3s/k3s-1.25.4_p1.ebuild deleted file mode 100644 index 953cdaa09023..000000000000 --- a/sys-cluster/k3s/k3s-1.25.4_p1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 2021-2023 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.8-k3s1 -K3S_RUNC_VERSION=v1.1.4 -K3S_ROOT_VERSION=0.11.0 -K3S_TRAEFIK_VERSION=19.0.4 -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 - 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://traefik.github.io/charts/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}" - newbin "${FILESDIR}/k3s-killall.sh" k3s-killall - 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/metadata.xml b/sys-cluster/k3s/metadata.xml deleted file mode 100644 index 27c2ee09163d..000000000000 --- a/sys-cluster/k3s/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>zmed...@gentoo.org</email> - <name>Zac Medico</name> - </maintainer> - <upstream> - <remote-id type="github">k3s-io/k3s</remote-id> - </upstream> - <use> - <flag name="kubectl-symlink"> - Install a kubectl symlink that points to k3s. - </flag> - <flag name="rootless"> - Enables dependencies for running in rootless mode. - </flag> - </use> -</pkgmetadata>
