From ce80202cfcf7f0dcb80e055eba3f6475232a5961 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Aug 2023 21:49:58 +0100 Subject: gentoo auto-resync : 23:08:2023 - 21:49:58 --- sys-cluster/kubelet/Manifest | 3 +- ...t-1.28.0-make-gomaxprocs-install-optional.patch | 78 ++++++++++++++++++++++ sys-cluster/kubelet/kubelet-1.28.0.ebuild | 4 ++ 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 sys-cluster/kubelet/files/kubelet-1.28.0-make-gomaxprocs-install-optional.patch (limited to 'sys-cluster/kubelet') diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest index eef2c49b275a..1d49cb12657f 100644 --- a/sys-cluster/kubelet/Manifest +++ b/sys-cluster/kubelet/Manifest @@ -1,3 +1,4 @@ +AUX kubelet-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f AUX kubelet.confd 58 BLAKE2B 5c01a2146beacf3a024f312d1bd3422055887ba48d5d869a32a2be99585f260f9d9b9946e57290345e0d57870f7d4509892c53fe4c7a63b0111b1fa8f464daf0 SHA512 2ae3bbc8a66da644b59d7f753294ad43d5675edbe2e4769b91d7c988d0eeffd5b4209a10650ad937f9698b1b6050279d448c75274815a6b348ad2023f2fef08e AUX kubelet.env 547 BLAKE2B db9144a0e155450f08a665700edbb05f3fa093d209f72320fdbcd54756afb857928a1d5828e79d3a54f958ddc41e8129a1489927115d1fc7712cd682699d3ac6 SHA512 3359ef337a27ea41b3db216808bb0baa571916bab37f913da79e0c9270199d75cfbb1a5730739b9207525e6027e38e8467e4c0b98567499d36130804f218e006 AUX kubelet.initd 520 BLAKE2B 50edf888fed020a02f099189f8a5bdde54a4bfa2a00585489864c262d90ad8347763753f99eccec6fe6670c6fa016674dee4dea0fa838991abb503db97bd983a SHA512 c6b9bcdb6d063728ef2e9d67673ea29c0972e70e446be9c020cfd277a7bbcfc955a5ad7a72ab0ca1579a4d04b0fc4ac71ee20e6dba9d9a9a9099efcad3c139d0 @@ -20,5 +21,5 @@ EBUILD kubelet-1.26.6.ebuild 1030 BLAKE2B 2f979623733f7f34b8f562572e1ac9b39c67d0 EBUILD kubelet-1.26.7.ebuild 1030 BLAKE2B 2f979623733f7f34b8f562572e1ac9b39c67d0ddb72ea366abd2e8eb7dc9fbbf655707374c479fdeb183739f06ed75bcf00732ab58eaed86db7c7c1db9ff10ef SHA512 0efd37f41d1e79af8e7febd651e532e17b3c04b1462d016131d4d5f75766928ed7b43bbef7a7728a3af4b0e6a948684ac63bc054794d2f6cfa32bbaddd46aa90 EBUILD kubelet-1.27.3.ebuild 1030 BLAKE2B e268e8d6e17c449e1e1f3b634b01a1ba8909454f796c4a96f28657f8122e70c1980b32cf3287d3668b3efb8d6d7cd1c5b06d2761dcba368431e772c371d30430 SHA512 a4c62f700caaba247646ce4c5f5d23e832d1d0334b5ef406e97e684833482e66b93b3951949fb74d75533e7c8a932fc261adaf52dd7a39abc35eb14a26a7e777 EBUILD kubelet-1.27.4.ebuild 1030 BLAKE2B e268e8d6e17c449e1e1f3b634b01a1ba8909454f796c4a96f28657f8122e70c1980b32cf3287d3668b3efb8d6d7cd1c5b06d2761dcba368431e772c371d30430 SHA512 a4c62f700caaba247646ce4c5f5d23e832d1d0334b5ef406e97e684833482e66b93b3951949fb74d75533e7c8a932fc261adaf52dd7a39abc35eb14a26a7e777 -EBUILD kubelet-1.28.0.ebuild 1031 BLAKE2B 73020b5c8a932f632fda1f65b566bf79adca8e448ccdb20bc73167c01cc524673b4dd81e7d07f0cf135803ec994d20e2e8f4d0138c7a890b38b7791e4c9e720b SHA512 6eec003a78eac972c8f01f1228a2282ba632e8d62317706f1bafc4f1213b548cf479a551b75835d01dbee9679bfb5d7c3f346db1b98ba4fcbabeb343876192a1 +EBUILD kubelet-1.28.0.ebuild 1103 BLAKE2B f32dd6ef29016fbebe25e9c061594f822fc83808d224d47b224dac2d2ecaed191b2884f0133d8a0d166a6201244e8d6cc2da69ba9303d8bb48eb1289521bd6fe SHA512 c64a03be394d7431de34653473bfec0c87e1e7d9610c8be51b4a13759dacf486fcabbd488db1b819975f5b2cb302e544b7338c2b3d7c7498a47d4b74897016d1 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb diff --git a/sys-cluster/kubelet/files/kubelet-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kubelet/files/kubelet-1.28.0-make-gomaxprocs-install-optional.patch new file mode 100644 index 000000000000..1a8935b31c9c --- /dev/null +++ b/sys-cluster/kubelet/files/kubelet-1.28.0-make-gomaxprocs-install-optional.patch @@ -0,0 +1,78 @@ +From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001 +From: Jordan Liggitt +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/kubelet/kubelet-1.28.0.ebuild b/sys-cluster/kubelet/kubelet-1.28.0.ebuild index cd8a1735b583..54fbe2ed430d 100644 --- a/sys-cluster/kubelet/kubelet-1.28.0.ebuild +++ b/sys-cluster/kubelet/kubelet-1.28.0.ebuild @@ -19,6 +19,10 @@ RDEPEND="selinux? ( sec-policy/selinux-kubernetes )" RESTRICT+=" test " S="${WORKDIR}/kubernetes-${PV}" +PATCHES=( + "${FILESDIR}"/${P}-make-install-gomaxprocs-optional.patch +) + src_compile() { CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \ emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN} -- cgit v1.2.3