commit: c90a65d339b6c87fb0c0414a9d05bcc850eae6eb Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sun Dec 11 20:58:08 2022 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sun Dec 11 21:13:47 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c90a65d3
sys-cluster/k3s: drop 1.25.2_p1, 1.25.3_p1 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> sys-cluster/k3s/Manifest | 4 -- sys-cluster/k3s/k3s-1.25.2_p1.ebuild | 102 ----------------------------------- sys-cluster/k3s/k3s-1.25.3_p1.ebuild | 102 ----------------------------------- 3 files changed, 208 deletions(-) diff --git a/sys-cluster/k3s/Manifest b/sys-cluster/k3s/Manifest index 3fe3370cf95e..ed6c96cedae1 100644 --- a/sys-cluster/k3s/Manifest +++ b/sys-cluster/k3s/Manifest @@ -1,10 +1,6 @@ -DIST k3s-1.25.2_p1-vendor.tar.gz 31890900 BLAKE2B 9a60ed25d4df0f8e2c90fe06de5b68656ce177dc5480a91272ecddbb75686ba86e61d600088a0fabeed37c1c28ec3d1ad46c514b8a248b1d0770f686da567a7a SHA512 c31098710c30b81cffbf1fd86084637c2563124e3415b8a83d428ced5e2bf81eb023de9b05a6990a2b8c236f1dab538a8f7fae6ef3105c266c40dd89c426c93a -DIST k3s-1.25.3_p1-vendor.tar.gz 31914962 BLAKE2B 6c392ec4988f5c875dfe892f9f032c90936a032f4dcaefca6da304c5495c079969b9bdc8f42f888ac0d922e81b965a3b074e3e5a18a960701ca6ec96e39cdc7e SHA512 6610d5660c403ef2ec04c2d35f796e8cb7cc4f3fcf65d209c9ff5e986da14f4d8c594f60eb9e02cc873d210f69af82a41681731e2586945f6bc44bd3cc364ff8 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-10.19.3.tgz 25287 BLAKE2B c43a5e066d78e066bc4449ad1d7a3796c99c5f029244dac5494a452592424a9be057b6a3d8eddd174d8daab2b322c4f54e39eae53fba67e97e1ebdb92ce2fd65 SHA512 6df4b186c4caad09abf47469757c1d26d3b593531704af53eb262208f1efa27b5b09b178c6dd6721e78362877e6ba3b2c8c3bfbc91fe152ce090b53ac283acf9 -DIST traefik-12.0.0.tgz 36268 BLAKE2B 9332e30d593c2c73cf06be8d7813807f6880e40d7f1c78f314b77e2fd2342e91f232f5288d2946eff586fc58c27fa182da30a50f37b91046d37a4aad6d3bc452 SHA512 5cd661ab609fc17c1fb52460c3d1e6ff3ee294f6dc8365b68e8a35a3e4b321b7ca75037eda2869ab72ca14836ba1c72b76d3cd92021dba56dd163b2678448dfc DIST traefik-19.0.4.tgz 64237 BLAKE2B f9cb2ab1b72446781dc0b214b9f986629e78134ee3942ebc62d6bec43b15e1ce9dc34b8bdecfe04d198308f6fe7145e4bfcd4b6386fae50eb4bdce56751e7dc3 SHA512 575bd49371a91a0b00247ce1f72b7b87adad3d0dbfe31b4e916ca35711eb8ec39cb07bc903d2d7e44dc0f4f963303fc9169fe80c0c38f7191b13b655740b814b diff --git a/sys-cluster/k3s/k3s-1.25.2_p1.ebuild b/sys-cluster/k3s/k3s-1.25.2_p1.ebuild deleted file mode 100644 index aa0253761385..000000000000 --- a/sys-cluster/k3s/k3s-1.25.2_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.6.8-k3s1 -K3S_RUNC_VERSION=v1.1.4 -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 -} diff --git a/sys-cluster/k3s/k3s-1.25.3_p1.ebuild b/sys-cluster/k3s/k3s-1.25.3_p1.ebuild deleted file mode 100644 index edd90a3d1c4e..000000000000 --- a/sys-cluster/k3s/k3s-1.25.3_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.6.8-k3s1 -K3S_RUNC_VERSION=v1.1.4 -K3S_ROOT_VERSION=0.11.0 -K3S_TRAEFIK_VERSION=12.0.0 -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 -}
