gentoo auto-resync : 23:08:2023 - 21:49:58

3 files changed, 84 insertions, 1 deletions

diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 70613a578fcf..5704968637bf 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,3 +1,4 @@
+AUX kube-proxy-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f
 AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
@@ -18,5 +19,5 @@ EBUILD kube-proxy-1.26.6.ebuild 903 BLAKE2B 1aa153095ce5f8bb28c12717c62936aac24b
 EBUILD kube-proxy-1.26.7.ebuild 903 BLAKE2B 1aa153095ce5f8bb28c12717c62936aac24b73b7e0780a4736c59a9c7c7a492c1c3bfc15343575bd4243c02a44ba2c73ec78fa064feed192c2410df575bae4af SHA512 cb2e2a9c28cce3b178ff30e08da842a75e8dee62c72d1243c503824ed180a31f5e27c76c885c248f2760e5ba1a7a009bf30d8706bbdbd07a609914a5b924f07d
 EBUILD kube-proxy-1.27.3.ebuild 903 BLAKE2B 1c939447d9c99d5723a207c0310c4a14cc45b39678af42304de57e93f127d398ca9e24369369c3db5848ee23e64ac77b900ddf61368bc821a571f143aa6663d2 SHA512 d59a856c6a5b9133188f7ad48ac975f4cb88eb4b95a78a6f4c30deb79a2a83e09ce4c9abb85fbb0111f121fc869b9e118f5a90c4f6e3113a0e2a88a15c29ae9f
 EBUILD kube-proxy-1.27.4.ebuild 903 BLAKE2B 1c939447d9c99d5723a207c0310c4a14cc45b39678af42304de57e93f127d398ca9e24369369c3db5848ee23e64ac77b900ddf61368bc821a571f143aa6663d2 SHA512 d59a856c6a5b9133188f7ad48ac975f4cb88eb4b95a78a6f4c30deb79a2a83e09ce4c9abb85fbb0111f121fc869b9e118f5a90c4f6e3113a0e2a88a15c29ae9f
-EBUILD kube-proxy-1.28.0.ebuild 904 BLAKE2B dd6a4ee3a1feff0f1250a81af3ed98a930e3814fc6ed496c3ebb5fb6f166e7649c6934e19f96a78a9f10c8bedff2dbfe6d8bf4d4b5406372f14e417f7aaf2112 SHA512 42fa664d157356844ade5f3ef4e477abc550cc9913d647643ce59618d5a2e4d4a3a0e3cd7b57cf6d0619aa7fef26e8c83963c02a8fe8106f0ee46cc06276375e
+EBUILD kube-proxy-1.28.0.ebuild 976 BLAKE2B df7e2d1ccb29e7aa44e4218ba6baf8f3120ac995f12fbdec1035451630809819f4df6a71c15b236731513d096e1d5c35d51b0200a25ba05b730c6d755cfba2c9 SHA512 1de585d08e31f43d13465e8307cac9a8609065c400934cd14bbdf99ee5e68a0b68e6e90603fcda17eb6342b3435e92afb4b90b5f896f2835fab71ccb5d76e685
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-proxy/files/kube-proxy-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kube-proxy/files/kube-proxy-1.28.0-make-gomaxprocs-install-optional.patch
new file mode 100644
index 000000000000..1a8935b31c9c
--- /dev/null
+++ b/sys-cluster/kube-proxy/files/kube-proxy-1.28.0-make-gomaxprocs-install-optional.patch
@@ -0,0 +1,78 @@
+From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001
+From: Jordan Liggitt <liggitt@google.com>
+Date: Wed, 16 Aug 2023 09:33:02 -0400
+Subject: [PATCH 2/2] Make gomaxprocs install optional, limit to tests
+
+---
+ hack/lib/golang.sh               | 25 +++++++++++++++----------
+ hack/make-rules/test-e2e-node.sh |  1 +
+ hack/make-rules/test.sh          |  1 +
+ 3 files changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh
+index 66772f08a81..983ff368e25 100755
+--- a/hack/lib/golang.sh
++++ b/hack/lib/golang.sh
+@@ -556,20 +556,25 @@ kube::golang::setup_env() {
+ 
+   # This seems to matter to some tools
+   export GO15VENDOREXPERIMENT=1
++}
+ 
++kube::golang::setup_gomaxprocs() {
+   # GOMAXPROCS by default does not reflect the number of cpu(s) available
+   # when running in a container, please see https://github.com/golang/go/issues/33803
+-  if ! command -v ncpu >/dev/null 2>&1; then
+-    # shellcheck disable=SC2164
+-    pushd "${KUBE_ROOT}/hack/tools" >/dev/null
+-    GO111MODULE=on go install ./ncpu
+-    # shellcheck disable=SC2164
+-    popd >/dev/null
++  if [[ -z "${GOMAXPROCS:-}" ]]; then
++    if ! command -v ncpu >/dev/null 2>&1; then
++      # shellcheck disable=SC2164
++      pushd "${KUBE_ROOT}/hack/tools" >/dev/null
++      GO111MODULE=on go install ./ncpu || echo "Will not automatically set GOMAXPROCS"
++      # shellcheck disable=SC2164
++      popd >/dev/null
++    fi
++    if command -v ncpu >/dev/null 2>&1; then
++      GOMAXPROCS=$(ncpu)
++      export GOMAXPROCS
++      kube::log::status "Set GOMAXPROCS automatically to ${GOMAXPROCS}"
++    fi
+   fi
+-
+-  GOMAXPROCS=${GOMAXPROCS:-$(ncpu)}
+-  export GOMAXPROCS
+-  kube::log::status "Setting GOMAXPROCS: ${GOMAXPROCS}"
+ }
+ 
+ # This will take binaries from $GOPATH/bin and copy them to the appropriate
+diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh
+index 43dde0c740f..49e3e04ac71 100755
+--- a/hack/make-rules/test-e2e-node.sh
++++ b/hack/make-rules/test-e2e-node.sh
+@@ -18,6 +18,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+ kube::golang::setup_env
++kube::golang::setup_gomaxprocs
+ 
+ # start the cache mutation detector by default so that cache mutators will be found
+ KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
+diff --git a/hack/make-rules/test.sh b/hack/make-rules/test.sh
+index e9074678a8f..4aa72730d83 100755
+--- a/hack/make-rules/test.sh
++++ b/hack/make-rules/test.sh
+@@ -22,6 +22,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/../..
+ source "${KUBE_ROOT}/hack/lib/init.sh"
+ 
+ kube::golang::setup_env
++kube::golang::setup_gomaxprocs
+ 
+ # start the cache mutation detector by default so that cache mutators will be found
+ KUBE_CACHE_MUTATION_DETECTOR="${KUBE_CACHE_MUTATION_DETECTOR:-true}"
+-- 
+2.41.0
+
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.28.0.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.28.0.ebuild
index ea991ff91e56..eb1ed50b5db5 100644
--- a/sys-cluster/kube-proxy/kube-proxy-1.28.0.ebuild
+++ b/sys-cluster/kube-proxy/kube-proxy-1.28.0.ebuild
@@ -19,6 +19,10 @@ BDEPEND=">=dev-lang/go-1.20"
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-make-gomaxprocs-install-optional.patch
+)
+
 src_compile() {
 	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
 		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}