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

3 files changed, 84 insertions, 1 deletions

diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index ec9a52773280..6eb4886d747f 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -1,3 +1,4 @@
+AUX kube-controller-manager-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f
 AUX kube-controller-manager.confd 142 BLAKE2B d8d35c62bf5c04cc3f440e8b5fb8acab2cf815b25ac4e91354e3fce756a1955e71ec762fab1091074ef4233fff22667aba50417c0d6a896055f8f52b6630bb4e SHA512 b0227a7431018a6742b3931fda0f14b4a040107ecd6821c84593180919ba8a5af9b99b7a507645a5488792f14accd686acc4cc6f70a5084bbdfcdd494021aafc
 AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544f214921672e60fffa2d6f77dbeb1912b3d1d138f867d8118cef5ae0843b75d3859ebfc71a4defc2b4cf66426a58101 SHA512 7e3baab9b034e7048ed3cda8d09444c76369874cecc0a747fb5484c482fef464adb5ccc25fcb4481fb4aff68415a60462f6cbee2138810316f0cf822637676c1
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
@@ -18,5 +19,5 @@ EBUILD kube-controller-manager-1.26.6.ebuild 988 BLAKE2B c0ef8c338ce9b85ea7f8751
 EBUILD kube-controller-manager-1.26.7.ebuild 988 BLAKE2B c0ef8c338ce9b85ea7f875158058fb09f6946862f32983f478638842b4b30e5eb43c5f82f0799f3f47491f19fba4475e9ca29b5630ef5e0b91bc4da472951c5a SHA512 02b9a4c1b5d8d0c4eb4ce3de6a2fcf99ca6d08c3b6bd51574f717a123ffd2499d77905af5a501f32df9b06ebf12e9757d87a61942fd9bb1b8210083321311b97
 EBUILD kube-controller-manager-1.27.3.ebuild 988 BLAKE2B cb730bcc2d0badbe5bbec3a13ac97a7059296d2f5f90fa6ddf4526a5f66b8f9ee45f9ee3035dbfcd1ca082a95b7e6875d7084dd983729c9fe4bb798f5200e57e SHA512 b589f8d4f13f14608227ff5ce34a2bd509b84188863a733bdd0ab8f8dae1b39046d2eef1e217cf7a6c014dcf37511024fe775fb72ec0ee6a7a72535611b7b814
 EBUILD kube-controller-manager-1.27.4.ebuild 988 BLAKE2B cb730bcc2d0badbe5bbec3a13ac97a7059296d2f5f90fa6ddf4526a5f66b8f9ee45f9ee3035dbfcd1ca082a95b7e6875d7084dd983729c9fe4bb798f5200e57e SHA512 b589f8d4f13f14608227ff5ce34a2bd509b84188863a733bdd0ab8f8dae1b39046d2eef1e217cf7a6c014dcf37511024fe775fb72ec0ee6a7a72535611b7b814
-EBUILD kube-controller-manager-1.28.0.ebuild 989 BLAKE2B fb2b9997a42d14c19b8a5a7e4c2c174b113e24f2e2f124bc2a7e65c77f41d0134e458c08b3dc333c7bb775f1e2a6142202ff54d997a74e7cfdf9c129ddef45cb SHA512 2d9dd0addd090f60b695056f82649573e1c86b97f65bd1ae85cf90265124e96ae2334fd1a01056eb7f60655baf1ab18f145c7f4257b41f3a5b3df275751db3f9
+EBUILD kube-controller-manager-1.28.0.ebuild 1062 BLAKE2B b2ad8e8f73a2c65b8d6c1b7052fef66e7a8c9c573d5300cb5e732e951c744be9d09f77d2317c148ac39ff48347e457a239f3401b2af195ed2a17b5d967a9ba56 SHA512 f37a0fe92c9e6ae2505a2c36981b8f70702b159f551b47900e7110a4d7d4d09f2b6dbfd04ade7b852006abfaeb49cfa1d12adfb80e8236708e6777b08ea25222
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-controller-manager/files/kube-controller-manager-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kube-controller-manager/files/kube-controller-manager-1.28.0-make-gomaxprocs-install-optional.patch
new file mode 100644
index 000000000000..1a8935b31c9c
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/files/kube-controller-manager-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-controller-manager/kube-controller-manager-1.28.0.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.0.ebuild
index dc4ca2df138b..683ee2008eeb 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.0.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.0.ebuild
@@ -22,6 +22,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=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}