Merge branch 'edge' into next

4 files changed, 276 insertions, 0 deletions

diff --git a/sys-cluster/kubernetes/Manifest b/sys-cluster/kubernetes/Manifest
index 2d89ca47e994..17286433976a 100644
--- a/sys-cluster/kubernetes/Manifest
+++ b/sys-cluster/kubernetes/Manifest
@@ -16,11 +16,17 @@ AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a005854898
 AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba83207ae89aae4f2e151a8b32e21b8d5e92229cccd7b7aa2676328d3d1a5fa80cadde65fe80a8cde10535d4 SHA512 05ce9ea16d2ddf8e255adb406556c37bc04dcfc457a132a78d31deaed78963f4e1f31555f781b706909c02815a04370d5c0e02614eb79d602b1cb827cf2471d5
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
 DIST kubernetes-1.16.8.tar.gz 31731459 BLAKE2B 1d53c16586b5a7a41fc42d0fb3444b694531d3f04fb9e168a70d4b98f966f322bc82d39234612e38c71da052002c5bcc452c747d9f948dacbdd91ea40a9f5417 SHA512 04c8e9a9227ac9a98074cd52cbe90758134fedb10164fa69accbc19716a2f18dc133a4f880d0e35a3728c377faea431363f00ae9fe2ff5ca9e509444da9106c5
+DIST kubernetes-1.16.9.tar.gz 31752857 BLAKE2B 34c0ff54e60276bf41ce971a8a50d57256f696ac95b551a90a6d2ccf1540279010953119def539c0824217fbbfc287d24b6f080e1fefce8864c1eade72d0777f SHA512 08fffe855a433ad0cc7586afd12815adb3bcafcac86712181625198fedbfe170bc36ae31aca9783d30dd790c415d447f073234f621416a76a7e4e0de2eeb008d
 DIST kubernetes-1.17.4.tar.gz 31777775 BLAKE2B cd04e429d3f524f5dce7948db9b22230df8abdeb7570001ab985ffdb5b85709a8d1698490b9df13455d8f3968741db9571ee1ab3bc2a6fdd06a8c0fe274476e2 SHA512 fd1944d26c840bc1d2f585fccbabf48091fe8820ea089b3ea5c18652fd1edb3c8157a70ea19111b8b62aef16e0284a1607b583c3c1af79dd0dd266b99e20c549
+DIST kubernetes-1.17.5.tar.gz 31788321 BLAKE2B b7531b9ba07a20aba6829e3351b3b66a64251970be3a07d44f8b20ef2d44fa7d80f2528c1c0a6c3dcf3373cbb21e500d26c0a53c4ed4b66bb334860c5f8ce3b9 SHA512 2f7fd071a11a4f9d53cf0b23e381d0e864a6dc19e1dab88c2b5bcdade514328714f651bc0caa9c302e74fab7d2823a0d724fe0f5444e13afcf89b792377af283
 DIST kubernetes-1.18.0.tar.gz 32554015 BLAKE2B 24079970cc1887c6dad7b55d9f2fd80cd9f46f1b6c1240cf28abf2eb33b3809bcd858293bb800255533a13e24145fab580b0bd2eb0e06c15ca4e0feeedcf6ff2 SHA512 3298ec63a2fbcd396b415f27a581f4286317ae206c30b35457aed780baae4115059df20e40028df394984caccc8bb4ef6c879ae3c064771c8a5c045dee7998e8
 DIST kubernetes-1.18.1.tar.gz 32581783 BLAKE2B ffacdba21dd6d326ddf9733c49ed3a16ad679fbd25b4ddda44b047a402a163474033d6b2328a816e83ede505aae07e205b68938165c546202fa6df2d03609ead SHA512 c002153e16494cd74e6f0609847602d6dcf166c8bab020341f8302b7cad5d7452ed1c2e66b3b230731d13401493d2d02f0500abcd526dbff44ae3aeabd210577
+DIST kubernetes-1.18.2.tar.gz 32585912 BLAKE2B 1f8dbd6e7a8ba4257abaf2926ada656ec42eb7e0f502f2b4fc75b2a6cacd9a6e91624a717772f605a24b42421933580bc399aca4480aa1c88009016160485a77 SHA512 9786312b06aea5cbd4e786e4b6d639ec4750fa6c8ba469d860702b317103ec464f038015ef038ba21841a0d627d58902769eb73a5d2fdf4da2f0ae4c0ec14e85
 EBUILD kubernetes-1.16.8.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
+EBUILD kubernetes-1.16.9.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 EBUILD kubernetes-1.17.4.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
+EBUILD kubernetes-1.17.5.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 EBUILD kubernetes-1.18.0.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 EBUILD kubernetes-1.18.1.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
+EBUILD kubernetes-1.18.2.ebuild 2304 BLAKE2B 0e9b3385e4c36396ebf10e3686b595a6c8572d522ba1e36cb627908d3055bdc2b093cf269100f7a56c5a07091303afcacd53f8a80d440a9d79bc223721ab1acf SHA512 10f3fee396053d98dec282b73c35ae72a028b9f84fa85c7ea3b94dc99ec18b916c366e7471093cc6725e58dc52fa640785bbac596e472a0856ac391529167e31
 MISC metadata.xml 719 BLAKE2B 4f7918cba4809becbff0cb1f6c6e9ce00e778c1a474955e64fccef68942a2e7fb337d5dbe8b01074b992497da913fbfbebe5705635245e8ce02f6daca4df7936 SHA512 9d4662622f1fa57b753018db9839b4399f3bb589a1e061821941738ea86a6d65cd0dbec31ffef658aeb14ac7d5c3840948694627b1fb32bc138b0f7dbf40a011
diff --git a/sys-cluster/kubernetes/kubernetes-1.16.9.ebuild b/sys-cluster/kubernetes/kubernetes-1.16.9.ebuild
new file mode 100644
index 000000000000..c333bbabb3b4
--- /dev/null
+++ b/sys-cluster/kubernetes/kubernetes-1.16.9.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="production-grade container orchestration"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+AGENT="kubelet"
+CLI="kubeadm kubectl"
+SERVICES="kube-apiserver kube-controller-manager kube-proxy kube-scheduler"
+IUSE="hardened"
+for x in ${AGENT} ${CLI} ${SERVICES}; do
+	IUSE+=" +${x}"
+done
+
+BDEPEND=">=dev-lang/go-1.13"
+COMMON_DEPEND="
+	kube-apiserver? (
+		acct-group/kube-apiserver
+		acct-user/kube-apiserver
+	)
+	kube-controller-manager? (
+		acct-group/kube-controller-manager
+		acct-user/kube-controller-manager
+	)
+	kube-scheduler? (
+		acct-group/kube-scheduler
+		acct-user/kube-scheduler
+	)"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	kube-proxy? ( net-firewall/conntrack-tools )
+	!sys-cluster/kubeadm
+	!sys-cluster/kubectl
+	!sys-cluster/kubelet
+	!sys-cluster/kube-apiserver
+	!sys-cluster/kube-controller-manager
+	!sys-cluster/kube-proxy
+	!sys-cluster/kube-scheduler"
+
+RESTRICT+=" test"
+
+src_compile() {
+	local x
+	for x in ${AGENT} ${CLI} ${SERVICES}; do
+		use $x || continue
+		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+			emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${x}
+	done
+}
+
+src_install() {
+	local x
+	for x in ${AGENT} ${CLI} ${SERVICES}; do
+		use $x || continue
+		dobin _output/bin/${x}
+		if has ${x} ${CLI}; then
+		_output/bin/${x} completion bash > ${x}.bash || die
+		_output/bin/${x} completion zsh > ${x}.zsh || die
+			newbashcomp ${x}.bash ${x}
+			insinto /usr/share/zsh/site-functions
+			newins ${x}.zsh _${x}
+			continue
+		fi
+		newinitd "${FILESDIR}"/${x}.initd ${x}
+		newconfd "${FILESDIR}"/${x}.confd ${x}
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/${x}.logrotated ${x}
+		keepdir /var/log/${x}
+		if [[ "$x" =~ kubelet ]]; then
+			systemd_dounit "${FILESDIR}"/${x}.service
+			insinto /etc/kubernetes
+			newins "${FILESDIR}"/${x}.env ${x}.env
+			keepdir /etc/kubernetes/manifests
+		fi
+		if [[ $x =~ kubelet|kube-proxy ]]; then
+			keepdir /var/lib/${x}
+		fi
+		if [[ $x =~ .*apiserver|.*controller-manager|.*scheduler ]]; then
+			fowners ${x}:${x} /var/log/${x}
+		fi
+	done
+}
diff --git a/sys-cluster/kubernetes/kubernetes-1.17.5.ebuild b/sys-cluster/kubernetes/kubernetes-1.17.5.ebuild
new file mode 100644
index 000000000000..c333bbabb3b4
--- /dev/null
+++ b/sys-cluster/kubernetes/kubernetes-1.17.5.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="production-grade container orchestration"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+AGENT="kubelet"
+CLI="kubeadm kubectl"
+SERVICES="kube-apiserver kube-controller-manager kube-proxy kube-scheduler"
+IUSE="hardened"
+for x in ${AGENT} ${CLI} ${SERVICES}; do
+	IUSE+=" +${x}"
+done
+
+BDEPEND=">=dev-lang/go-1.13"
+COMMON_DEPEND="
+	kube-apiserver? (
+		acct-group/kube-apiserver
+		acct-user/kube-apiserver
+	)
+	kube-controller-manager? (
+		acct-group/kube-controller-manager
+		acct-user/kube-controller-manager
+	)
+	kube-scheduler? (
+		acct-group/kube-scheduler
+		acct-user/kube-scheduler
+	)"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	kube-proxy? ( net-firewall/conntrack-tools )
+	!sys-cluster/kubeadm
+	!sys-cluster/kubectl
+	!sys-cluster/kubelet
+	!sys-cluster/kube-apiserver
+	!sys-cluster/kube-controller-manager
+	!sys-cluster/kube-proxy
+	!sys-cluster/kube-scheduler"
+
+RESTRICT+=" test"
+
+src_compile() {
+	local x
+	for x in ${AGENT} ${CLI} ${SERVICES}; do
+		use $x || continue
+		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+			emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${x}
+	done
+}
+
+src_install() {
+	local x
+	for x in ${AGENT} ${CLI} ${SERVICES}; do
+		use $x || continue
+		dobin _output/bin/${x}
+		if has ${x} ${CLI}; then
+		_output/bin/${x} completion bash > ${x}.bash || die
+		_output/bin/${x} completion zsh > ${x}.zsh || die
+			newbashcomp ${x}.bash ${x}
+			insinto /usr/share/zsh/site-functions
+			newins ${x}.zsh _${x}
+			continue
+		fi
+		newinitd "${FILESDIR}"/${x}.initd ${x}
+		newconfd "${FILESDIR}"/${x}.confd ${x}
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/${x}.logrotated ${x}
+		keepdir /var/log/${x}
+		if [[ "$x" =~ kubelet ]]; then
+			systemd_dounit "${FILESDIR}"/${x}.service
+			insinto /etc/kubernetes
+			newins "${FILESDIR}"/${x}.env ${x}.env
+			keepdir /etc/kubernetes/manifests
+		fi
+		if [[ $x =~ kubelet|kube-proxy ]]; then
+			keepdir /var/lib/${x}
+		fi
+		if [[ $x =~ .*apiserver|.*controller-manager|.*scheduler ]]; then
+			fowners ${x}:${x} /var/log/${x}
+		fi
+	done
+}
diff --git a/sys-cluster/kubernetes/kubernetes-1.18.2.ebuild b/sys-cluster/kubernetes/kubernetes-1.18.2.ebuild
new file mode 100644
index 000000000000..c333bbabb3b4
--- /dev/null
+++ b/sys-cluster/kubernetes/kubernetes-1.18.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="production-grade container orchestration"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+AGENT="kubelet"
+CLI="kubeadm kubectl"
+SERVICES="kube-apiserver kube-controller-manager kube-proxy kube-scheduler"
+IUSE="hardened"
+for x in ${AGENT} ${CLI} ${SERVICES}; do
+	IUSE+=" +${x}"
+done
+
+BDEPEND=">=dev-lang/go-1.13"
+COMMON_DEPEND="
+	kube-apiserver? (
+		acct-group/kube-apiserver
+		acct-user/kube-apiserver
+	)
+	kube-controller-manager? (
+		acct-group/kube-controller-manager
+		acct-user/kube-controller-manager
+	)
+	kube-scheduler? (
+		acct-group/kube-scheduler
+		acct-user/kube-scheduler
+	)"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	kube-proxy? ( net-firewall/conntrack-tools )
+	!sys-cluster/kubeadm
+	!sys-cluster/kubectl
+	!sys-cluster/kubelet
+	!sys-cluster/kube-apiserver
+	!sys-cluster/kube-controller-manager
+	!sys-cluster/kube-proxy
+	!sys-cluster/kube-scheduler"
+
+RESTRICT+=" test"
+
+src_compile() {
+	local x
+	for x in ${AGENT} ${CLI} ${SERVICES}; do
+		use $x || continue
+		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+			emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${x}
+	done
+}
+
+src_install() {
+	local x
+	for x in ${AGENT} ${CLI} ${SERVICES}; do
+		use $x || continue
+		dobin _output/bin/${x}
+		if has ${x} ${CLI}; then
+		_output/bin/${x} completion bash > ${x}.bash || die
+		_output/bin/${x} completion zsh > ${x}.zsh || die
+			newbashcomp ${x}.bash ${x}
+			insinto /usr/share/zsh/site-functions
+			newins ${x}.zsh _${x}
+			continue
+		fi
+		newinitd "${FILESDIR}"/${x}.initd ${x}
+		newconfd "${FILESDIR}"/${x}.confd ${x}
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/${x}.logrotated ${x}
+		keepdir /var/log/${x}
+		if [[ "$x" =~ kubelet ]]; then
+			systemd_dounit "${FILESDIR}"/${x}.service
+			insinto /etc/kubernetes
+			newins "${FILESDIR}"/${x}.env ${x}.env
+			keepdir /etc/kubernetes/manifests
+		fi
+		if [[ $x =~ kubelet|kube-proxy ]]; then
+			keepdir /var/lib/${x}
+		fi
+		if [[ $x =~ .*apiserver|.*controller-manager|.*scheduler ]]; then
+			fowners ${x}:${x} /var/log/${x}
+		fi
+	done
+}