gentoo auto-resync : 04:10:2023 - 23:52:39

2 files changed, 0 insertions, 79 deletions

diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index b20baaf6a64b..3db8ca0e4ac4 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -1,4 +1,3 @@
-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
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
deleted file mode 100644
index 1a8935b31c9c..000000000000
--- a/sys-cluster/kube-apiserver/files/kube-apiserver-1.28.0-make-gomaxprocs-install-optional.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-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
-