gentoo resync : 25.08.2020

3 files changed, 200 insertions, 50 deletions

diff --git a/sys-cluster/kube-router/Manifest b/sys-cluster/kube-router/Manifest
index bd4611c9e35f..2a2bd90fe1aa 100644
--- a/sys-cluster/kube-router/Manifest
+++ b/sys-cluster/kube-router/Manifest
@@ -1,8 +1,8 @@
 AUX kube-router.confd 320 BLAKE2B a3b4973007bab2d7b4bf4f21beb85c59adb0d66b2dd4bf1152d7818b1039e74624e0a2255123cbdace8e419aed1e0a9e87ba3c6b7fa7263cb4667fcabce6829b SHA512 cc150ad9dae389011449c31541a326625f781ead15cc12502bdb5704b13921e0a4a740abb27fafb7dc260c6d66f44e855ecf5ef1300077377a9aa0a08f50db1c
 AUX kube-router.initd 963 BLAKE2B 5226134d18790b246bcd516f72f54f992ebc61f69799a730e095e65bc4c805494d8760ec0ce9f564c8ee7856379993cf18b9e5ce3d10c25afbbc0937b1d075b8 SHA512 f6c41ae0ff20abd1e1f29ede282f49fad0112fa634104b6603d5a1d78ff6457e5739956b2e28353f2b21964b5ec11158626b1cbbb8cea510cdb5463a062e8d63
 AUX kube-router.logrotated 85 BLAKE2B 41c40f60ee686f7387e01c85345e6d8d3c562df2363ba3963a0f465d70a3439d2496931b94f05a1c607d04d4269fd087a4c0e1fd9c3a6f7db89d33bbc366bb30 SHA512 19e92adbc5ff8548784481cdc63d8010c386ea799350d7426c22f9b71c09c4ec9b1ec0a7e08069e1fb5cb51b0a37435ae42b12caf2d8679f2cb892fdc6bf96e1
-DIST kube-router-0.3.1.tar.gz 8468463 BLAKE2B 23ee608e6415b3627f5024c8778ae1f33c5db3c1c564d0eb1e0fcb45dd90ff4a148c39e7fd0a4888d6b4cf13b129c5249c2db868efa584f15e31c7ff539829d5 SHA512 185e3a58dc6112e33ed7dc5702795dd7be0a37b63c7c882a1c092060a57a755ea4ea5c2cc96c93210bee632a4a4c4b19f3506ceb44b96d4727cf62cb2f28818f
 DIST kube-router-0.4.0.tar.gz 8403982 BLAKE2B e5e9e92064f00d696ca1cde310813541910d3e37b9c31336b1f2729e63a963fb454a2a9d07b2394134b9ea96e64d6caa26b6230bfd214883f5951bcfdd30c674 SHA512 00617e434b770c1b5eeb3f2c85ae9b6f49157224a5df223f5d1ec514ba087164bb03f0e28a38c75d3149c0c028ed54ceccf898a77c474bbf64921f45db7c3e3c
-EBUILD kube-router-0.3.1.ebuild 1215 BLAKE2B 970ee268727734fe74f96249931407b509cd88459cec456ea777b4f59c11f4e118424678be89ff464a23434b8cedf3f324fe8cd3a8b8a9ad05698df0d356cde9 SHA512 f19fb68677601b84f7e846c9d07744f1098cd34c49ef31ed53af533a08773dbf0abdcb0f46c54846e2c61bfd4a6e9c6cea88e52967d1d1274482ab9230779e31
+DIST kube-router-1.0.1.tar.gz 8413249 BLAKE2B dd158fda5a25925d1f630764f7ad77a821c145def887093692333fcdb4e9a3d9736fe3243f7834abf60d71835fe37a81e4d0a9f20cb45e05d9bb817a50d81196 SHA512 a84176785367fb87562a9a410d87376d938fb32c8aec0cd71259ca3af2204b76ba083201b5f2ad38b395a83a321f0feec4b304a4f3add595b5eadf0837a6918b
 EBUILD kube-router-0.4.0.ebuild 5257 BLAKE2B ddde07a17a1683a0c4adb1fa99e78ac15850a762c1eaeed2e4cac1957fd7225a5c402795d817cc8e9700d3aa170ae004d5d16e9664304a74931c123e9a5436f8 SHA512 00aeb5a34a105d0e5ce74ec835ae2e8df56ec7f9994577d7bebe6a4c1e254977e96029573a0b6c29fcbff3ea2a9f1f7eff14f0d3171604bd6d910c06c0fbedcf
+EBUILD kube-router-1.0.1.ebuild 6423 BLAKE2B 6fe7a2501be0970e96f99a390bd26af361c244a7b2b8fe3b3daef3a2b75a8657256276551a6e1d849b65ce36c43476c7f22e474d2c64aa844c43458f615202df SHA512 ad87bf32a8475821ce9af56313c7882c854b417dcc1f073efe8675952a384b6683c377735912815930c5d0f5cf45191edfad6ab88bad23bd37c9b31abbde6fd7
 MISC metadata.xml 848 BLAKE2B 3ba78ece1af8cf69ab50f10afdd24ff8765b1bace2ba02ec094dde976d216d7cb1afc9a2d69d6b674aa03bd842bfa453f0583380119bf8595fbc524fc9fd0e51 SHA512 5746d825adf43cbf15d4d9886194c1ab351497a0dc8110d9e19c879c306ac1e808c1986346de5f842b8b3910febebbe7b81f6c909f3ccd7067507b83396b166e
diff --git a/sys-cluster/kube-router/kube-router-0.3.1.ebuild b/sys-cluster/kube-router/kube-router-0.3.1.ebuild
deleted file mode 100644
index c0be2fdbb4e0..000000000000
--- a/sys-cluster/kube-router/kube-router-0.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-EGO_PN="github.com/cloudnativelabs/${PN}"
-
-inherit golang-build golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-
-DESCRIPTION="A turnkey solution for Kubernetes networking"
-HOMEPAGE="https://kube-router.io"
-SRC_URI="https://github.com/cloudnativelabs/kube-router/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 MIT BSD BSD-2 MPL-2.0 ISC LGPL-3-with-linking-exception"
-SLOT="0"
-
-RDEPEND="
-	net-firewall/iptables[conntrack]
-	net-firewall/ipset
-	sys-cluster/ipvsadm
-"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	GOPATH="${S}" go build -x -work -v \
-		-ldflags "-X 'github.com/cloudnativelabs/kube-router/pkg/cmd.version=${PV}' "\
-"-X 'github.com/cloudnativelabs/kube-router/pkg/cmd.buildDate=$(date -u +%FT%T%z)'" \
-		-o kube-router cmd/kube-router/kube-router.go || die
-	popd || die
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	pushd "src/${EGO_PN}" || die
-	dobin "${PN}"
-	dodoc *.md docs/*.md docs/*/*
-	popd || die
-
-	newinitd "${FILESDIR}"/kube-router.initd kube-router
-	newconfd "${FILESDIR}"/kube-router.confd kube-router
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/kube-router.logrotated kube-router
-}
diff --git a/sys-cluster/kube-router/kube-router-1.0.1.ebuild b/sys-cluster/kube-router/kube-router-1.0.1.ebuild
new file mode 100644
index 000000000000..f1c72e8048b8
--- /dev/null
+++ b/sys-cluster/kube-router/kube-router-1.0.1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN="github.com/cloudnativelabs/${PN}"
+
+inherit golang-build golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+
+DESCRIPTION="A turnkey solution for Kubernetes networking"
+HOMEPAGE="https://kube-router.io"
+SRC_URI="https://github.com/cloudnativelabs/kube-router/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 MIT BSD BSD-2 MPL-2.0 ISC LGPL-3-with-linking-exception"
+
+SLOT="0"
+
+RDEPEND="
+	net-firewall/iptables[conntrack]
+	net-firewall/ipset
+	sys-cluster/ipvsadm
+"
+
+# Vendored dependencies (helps with LICENSE, see https://bugs.gentoo.org/694792):
+# github.com/PuerkitoBio/purell # BSD
+# github.com/PuerkitoBio/urlesc # BSD
+# github.com/armon/go-radix # MIT
+# github.com/aws/aws-sdk-go # Apache-2.0
+# github.com/beorn7/perks # MIT
+# github.com/containernetworking/cni # Apache-2.0
+# github.com/coreos/go-iptables # Apache-2.0
+# github.com/docker/distribution # Apache-2.0
+# github.com/docker/docker # Apache-2.0
+# github.com/docker/go-connections # Apache-2.0
+# github.com/docker/go-units # Apache-2.0
+# github.com/docker/libnetwork # Apache-2.0
+# github.com/davecgh/go-spew # ISC
+# github.com/dgryski/go-farm # MIT
+# github.com/eapache/channels # MIT
+# github.com/eapache/queue # MIT
+# github.com/emicklei/go-restful # MIT
+# github.com/emicklei/go-restful-swagger12 # MIT
+# github.com/fsnotify/fsnotify # BSD
+# github.com/ghodss/yaml # MIT BSD
+# github.com/go-ini/ini # Apache-2.0
+# github.com/go-openapi/jsonpointer # Apache-2.0
+# github.com/go-openapi/jsonreference # Apache-2.0
+# github.com/go-openapi/spec # Apache-2.0
+# github.com/go-openapi/swag # Apache-2.0
+# github.com/gogo/protobuf # BSD
+# github.com/golang/glog # Apache-2.0
+# github.com/golang/protobuf # BSD
+# github.com/google/btree # Apache-2.0
+# github.com/google/gofuzz # Apache-2.0
+# github.com/googleapis/gnostic # Apache-2.0
+# github.com/gregjones/httpcache # MIT
+# github.com/hashicorp/golang-lru # MPL-2.0
+# github.com/hashicorp/hcl # MPL-2.0
+# github.com/howeyc/gopass # ISC
+# github.com/imdario/mergo # BSD
+# github.com/influxdata/influxdb # MIT
+# github.com/jmespath/go-jmespath # Apache-2.0
+# github.com/json-iterator/go # MIT
+# github.com/juju/ratelimit # LGPL-3-with-linking-exception
+# github.com/magiconair/properties # BSD-2
+# github.com/mailru/easyjson # MIT
+# github.com/matttproud/golang_protobuf_extensions # Apache-2.0
+# github.com/mitchellh/mapstructure # MIT
+# github.com/modern-go/concurrent # Apache-2.0
+# github.com/modern-go/reflect2 # Apache-2.0
+# github.com/opencontainers/go-digest # Apache-2.0
+# github.com/opencontainers/image-spec # Apache-2.0
+# github.com/osrg/gobgp # Apache-2.0
+# github.com/pelletier/go-toml # MIT
+# github.com/peterbourgon/diskv # MIT
+# github.com/pkg/errors # BSD-2
+# github.com/prometheus/client_golang # Apache-2.0
+# github.com/prometheus/client_model # Apache-2.0
+# github.com/prometheus/common # Apache-2.0
+# github.com/prometheus/procfs # Apache-2.0
+# github.com/satori/go.uuid # MIT
+# github.com/sirupsen/logrus # MIT
+# github.com/spf13/afero # Apache-2.0
+# github.com/spf13/cast # MIT
+# github.com/spf13/jwalterweatherman # MIT
+# github.com/spf13/pflag # BSD
+# github.com/spf13/viper # MIT
+# github.com/vishvananda/netlink # Apache-2.0
+# github.com/vishvananda/netns # Apache-2.0
+# google.golang.org/genproto # Apache-2.0
+# google.golang.org/grpc # Apache-2.0
+# golang.org/x/crypto # BSD
+# golang.org/x/net # BSD
+# golang.org/x/sys # BSD
+# golang.org/x/text # BSD
+# k8s.io/api # Apache-2.0
+# k8s.io/apimachinery # Apache-2.0
+# k8s.io/client-go # Apache-2.0
+# k8s.io/kube-openapi # Apache-2.0
+# gopkg.in/inf.v0 # BSD
+# gopkg.in/tomb.v2 # BSD
+# gopkg.in/yaml.v2 # Apache-2.0 && MIT
+
+# Test dependencies:
+# github.com/onsi/ginkgo # MIT
+# github.com/onsi/gomega # MIT
+
+src_prepare() {
+	eapply_user
+	# we are going to remove some stuff that is not required for compoilation
+	# but may have some license issues
+	local unneeded_dir
+	local unneeded_dirs=(
+		github.com/howeyc/gopass/terminal_solaris.go
+		github.com/docker/libnetwork/client/mflag
+		github.com/prometheus/client_model/ruby
+		github.com/docker/docker/contrib
+
+		github.com/Microsoft/go-winio
+		github.com/inconshreveable/mousetrap
+
+		github.com/petar/GoLLRB
+		github.com/spf13/cobra
+	)
+	for unneeded_dir in ${unneeded_dirs[@]}; do
+		mv -v "${S}/src/${EGO_PN}/vendor/${unneeded_dir}" "${T}" || \
+			die "can't remove ${unneeded_dir}"
+	done
+}
+
+src_compile() {
+	pushd "src/${EGO_PN}" || die
+	GOPATH="${S}" go build -x -work -v \
+		-ldflags "-X 'github.com/cloudnativelabs/kube-router/pkg/cmd.version=${PV}' "\
+"-X 'github.com/cloudnativelabs/kube-router/pkg/cmd.buildDate=$(date -u +%FT%T%z)'" \
+		-o kube-router cmd/kube-router/kube-router.go || die
+	popd || die
+}
+
+src_test() {
+	local line
+	local testdirs="github.com/cloudnativelabs/kube-router/cmd/kube-router/
+		github.com/cloudnativelabs/kube-router/pkg/..."
+
+	local known_fail=(
+		Test_advertiseClusterIPs
+		Test_advertiseExternalIPs
+		Test_advertiseAnnotationOptOut
+		Test_advertiseAnnotationOptIn
+		Test_advertisePodRoute
+		Test_syncInternalPeers
+		Test_AddPolicies
+		Test_routeReflectorConfiguration
+	)
+
+	# concat as '|^Test1$|^Test2$|^Test3...$':
+	local known_fail_re="$(printf '|^%s$' "${known_fail[@]}" || die)"
+	# drop '|' in the begining:
+	known_fail_re="${known_fail_re:1}"
+
+	einfo "Looking for tests"
+	local working_tests_re="$(
+		# get list of all test:
+		{
+			GOFLLAGS="-mod=readonly" GOPATH="${S}" \
+				go test -list . ${testdirs} ||
+			die "Can't get list of tests";
+		} |
+		{ while read line; do echo "${line}"; echo "${line}" >&2; done; } |
+		# skip "no tests" messages as well as know failures:
+		{ grep -v -E " |${known_fail_re}" || die "Can't parse tests list"; } |
+		# format a regexp:
+		{ sed -z 's/\n/$|^/g' || die; }
+	)"
+	# drop '|^' in the end:
+	working_tests_re="^${working_tests_re::-2}"
+
+	GOFLLAGS="-mod=readonly" GOPATH="${S}" \
+		go test -v -timeout 30s -run "${working_tests_re}" ${testdirs} || \
+			die "Tests failed"
+	GOFLLAGS="-mod=readonly" GOPATH="${S}" \
+		go test -v -timeout 30s -run "${known_fail_re}" ${testdirs} || \
+			ewarn "Known test failure"
+}
+
+src_install() {
+	pushd "src/${EGO_PN}" || die
+	dobin "${PN}"
+	einstalldocs
+	popd || die
+
+	newinitd "${FILESDIR}"/kube-router.initd kube-router
+	newconfd "${FILESDIR}"/kube-router.confd kube-router
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/kube-router.logrotated kube-router
+}