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

3 files changed, 84 insertions, 1 deletions

diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 81234c64f616..b3186b58d136 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,3 +1,4 @@
+AUX kubeadm-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f
 DIST kubernetes-1.24.14.tar.gz 37908337 BLAKE2B 08f52b611bea49f1c204a4fb956d87be6f571ef122b4cc10101862c61d11751d944d9140c4355be95759f83240cb8a3d4879c72e077bdc10f235d03b1a0f99f7 SHA512 74cee62fdc7e0dca1430688e832d3b308b6604dee6ca88d5f19fd6b6a9c83833d003ae87d8a09866e2e8fd01cbde0a6ae4bd126f9845f770c76942f1772f04bb
 DIST kubernetes-1.24.15.tar.gz 38151496 BLAKE2B 47064fefb135031ed220341d34519b4ee2e6fb5996e4bacdfd94e5dd01c1e70b0ca56c0eda45208039004ab9f0f2c3d1de3d77f450d7a59ab5ccd1c6e4dc8b0e SHA512 48e450c76fe3c9bd8460a18bbff204ba7b548c807f984ba86ff388206bfc8a178d96718df377a354c88a99c66b54013ee85ba18b7778bd68cee610955abf2498
 DIST kubernetes-1.25.11.tar.gz 38468419 BLAKE2B fa90ffc6fdcba31f4fb70f7ea9cecae5d8e42efb0596abb2aa638e9d235f770cf4772cfa926b3e1a59fa37ae84bc1524d803215d4eccc04cc1d38ec4b884a9fa SHA512 e3805cf6ad4e5b4ce5fb53a73873a3e447cc62b26f106afa1eec21071a7912cfd2e972f27f40c183af3e67a8ac107adc97d63a303b844dcae62e5efa0e1879a5
@@ -15,5 +16,5 @@ EBUILD kubeadm-1.26.6.ebuild 964 BLAKE2B 98417244686292bceab7268358757606d233d5b
 EBUILD kubeadm-1.26.7.ebuild 964 BLAKE2B 98417244686292bceab7268358757606d233d5b17f1cff311969993ee9f7a78c80449dd0bc3a22e08eabba9fa1a9e9865edfaaa158103dc7df9211a60a3b8ee3 SHA512 9f7348c3c1a7a1f16a523af7243b08570102e953c692aed930ecbfd2307577eb2f0cb61f3df6dfb5ab79fd162bad6c1f2b430ac6d1ba013d2b1f05c5c6e31e79
 EBUILD kubeadm-1.27.3.ebuild 964 BLAKE2B 2de314b49858492b10da2d4de81f4fb185ed98a7854d2cd905c616e77fa19a42358d8d6b8199b3a641ff39b03426b9e8e67d6057cdb479d29a72af31679267b2 SHA512 0a5fbd3122ad732b7d84598f1f4fe2fde522462007a06b7dfbdcf939b64b3eeb1c2e2a6f1ec00d37278790701f27e6ae7e5509e8683c972db7973ed53e241a1b
 EBUILD kubeadm-1.27.4.ebuild 964 BLAKE2B 2de314b49858492b10da2d4de81f4fb185ed98a7854d2cd905c616e77fa19a42358d8d6b8199b3a641ff39b03426b9e8e67d6057cdb479d29a72af31679267b2 SHA512 0a5fbd3122ad732b7d84598f1f4fe2fde522462007a06b7dfbdcf939b64b3eeb1c2e2a6f1ec00d37278790701f27e6ae7e5509e8683c972db7973ed53e241a1b
-EBUILD kubeadm-1.28.0.ebuild 983 BLAKE2B ee641f0271ce5abd3e90dcdf3888955725a573f89c42dd903d38d85c7b8d36e4384301678d3072b19bd477b0db3f960ab5b0d961673b13bfc6e63924bdd00076 SHA512 1f4f290a65db5bba37df7f3dc838e2bcdab84d23b3d84e8f1f3b312c70ab5cc3dfcd37be61ee0530de0656b1a6b282814276562f478887907c77b7eaef3fcbf1
+EBUILD kubeadm-1.28.0.ebuild 1056 BLAKE2B 235f9dcd4e3f751426ecb28f5f5ffe9effa9ddfd69cf3cb52f3555343a3e7b35578126b1fd1a27e6f724db77ffc4385e70689d52bd1b77ee2f87466a8e5351de SHA512 e3f7f455c0fa19eed967386c3bedbe2cab72e678c133db684b0debd78639694d2f38c732b483ccdaf9674ef3bf6ca78db7d85ce0e04e49e5308ebbebd60cb14b
 MISC metadata.xml 918 BLAKE2B 487a711e9aebe9d4d8f2c3a03664990aa544a4c0b969dbb60d10ebf42ca64cb9b21f822f92e774f3a813b409d5df905c8ecf02f186218f925a69f70b2960d53c SHA512 392d1cdf4179bc2aa14598e41e38e364518f0c71c34d61280729ae2cdab37c247112b48fcea58c792f6f7148e3979dfbff174bac3a3a00b7084168332112f5d3
diff --git a/sys-cluster/kubeadm/files/kubeadm-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kubeadm/files/kubeadm-1.28.0-make-gomaxprocs-install-optional.patch
new file mode 100644
index 000000000000..1a8935b31c9c
--- /dev/null
+++ b/sys-cluster/kubeadm/files/kubeadm-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/kubeadm/kubeadm-1.28.0.ebuild b/sys-cluster/kubeadm/kubeadm-1.28.0.ebuild
index a7a02677a302..a1c9807b07ae 100644
--- a/sys-cluster/kubeadm/kubeadm-1.28.0.ebuild
+++ b/sys-cluster/kubeadm/kubeadm-1.28.0.ebuild
@@ -20,6 +20,10 @@ RDEPEND="app-containers/cri-tools
 RESTRICT+=" test"
 S="${WORKDIR}/kubernetes-${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-make-gomaxprocs-install-optional.patch
+	)
+
 src_compile() {
 	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" FORCE_HOST_GO=yes \
 		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}