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

3 files changed, 85 insertions, 2 deletions

diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 2becbc29720d..447c77d4a09a 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,3 +1,4 @@
+AUX kube-apiserver-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f
 AUX kube-apiserver.confd 116 BLAKE2B 2cf2dff516674ba4dc0763985a070b75e23f9af51e7334eedcb2593855e7481d5969ed458d322ac29de0e9a9c7f9f041911ee7aeca750ff77ce04fd60bf3a3d3 SHA512 302b2a7ec715967c0aa7d1c177d4e55b26e37ebba8d04dd37ecf627d20042fe91cd7e6192ff9d71422129b0ea54a9eec6046f505af550548bd450998924f37ee
 AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c737d041a808fb5012522844614a40059524c472b9b50fd077253b75e2bcf33d69518d71428fcb7e27143fba SHA512 2863ad6d1d238b5e9557874cd3f5413108ed9424604cf026e2fd8c2fd66ba867ca9a3d98f67fdac54f335bacddf0479547b28f71aaa1db6580beff49290de110
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
@@ -18,5 +19,5 @@ EBUILD kube-apiserver-1.26.6.ebuild 991 BLAKE2B 27a5563d75bb7c818335c8d019b63c23
 EBUILD kube-apiserver-1.26.7.ebuild 991 BLAKE2B 27a5563d75bb7c818335c8d019b63c2371a7c72d679bb237d79cc699ffd7e5f4f5f11a4197cdd086c4162d2af3fcb5c252a4effcd2fdc7ddf95fc0c1c2784946 SHA512 4dcce5a68b1f97d9f13191677fb21324317f38d5b4b2f15d4514b83ea96e097d5bbe86260c1f8ad462373d234cbe361ef9e2b3b615ee4cb86d984b83b5acddd8
 EBUILD kube-apiserver-1.27.3.ebuild 991 BLAKE2B a8f7a56d24d5d28dd947049982b22b2b409bd04a4257dff823833b63d48a842cdcc1a1dd48cab9aae8cc5cd91b2e760937898d75685e88c0ff3de5e87c755708 SHA512 03d62b412a1400c9a10c694a08a6e1dd8bcf431e4c1204e06bf10861d844a195a7e1dac51c61d34621129277bf898f83e5aeaced8798e06bcf3c80c339b235e5
 EBUILD kube-apiserver-1.27.4.ebuild 991 BLAKE2B a8f7a56d24d5d28dd947049982b22b2b409bd04a4257dff823833b63d48a842cdcc1a1dd48cab9aae8cc5cd91b2e760937898d75685e88c0ff3de5e87c755708 SHA512 03d62b412a1400c9a10c694a08a6e1dd8bcf431e4c1204e06bf10861d844a195a7e1dac51c61d34621129277bf898f83e5aeaced8798e06bcf3c80c339b235e5
-EBUILD kube-apiserver-1.28.0.ebuild 992 BLAKE2B 2220811e7ac652e6fe35de874d2b22d2c1bbed04d79b44625f044d07f081f2c11c34d6bc213b225f1face82fe5ac30b9c5e273ff718cbfb164c88cdca8fa03d5 SHA512 9c8fce637e8dae24fc85ecf79a2d8a21196d45e5dd70cabedfd34dc49be4ab369ff59e93f0c73db13347dc5ef8b6521903cc47a8c1cca46809ea9a10b0c52f01
+EBUILD kube-apiserver-1.28.0.ebuild 1085 BLAKE2B 143ea51902685ea5f88d50d7c828ff64f9021d647e6711fd42ea8d3e266951e3753f147a9b88793084472defe0a8e8de0d9f3d0291b61b6cf4a0d5ba2a7a2cbd SHA512 b65b1197372d4e77396d94070e68d5a7ef4114277c2a9202520b087b95bba769c89b5ad7cb41d4c1e1e3d53c51a2a1ac0c95d30c811ab0dbcd4418a90e95367b
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-apiserver/files/kube-apiserver-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kube-apiserver/files/kube-apiserver-1.28.0-make-gomaxprocs-install-optional.patch
new file mode 100644
index 000000000000..1a8935b31c9c
--- /dev/null
+++ b/sys-cluster/kube-apiserver/files/kube-apiserver-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-apiserver/kube-apiserver-1.28.0.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.28.0.ebuild
index 4385ac330a7d..4e599b798a47 100644
--- a/sys-cluster/kube-apiserver/kube-apiserver-1.28.0.ebuild
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.28.0.ebuild
@@ -23,8 +23,12 @@ 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 ' '')" \
+	CGO_LDFLAGS="$(usex hardened '-fNO-PIC ' '')" FORCE_HOST_GO="yes" \
 		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
 }