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

2 files changed, 0 insertions, 79 deletions

diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 225d3c14ad99..69f0cb2d4c76 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -1,4 +1,3 @@
-AUX kube-proxy-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f
 AUX kube-proxy.confd 53 BLAKE2B 0cd5fc844dc21f63786ef21d972210ac02ea55165b05cef8810268f894e3466cea4d82c7882e56d6a0bf425311adbf6a55e3e3fe351b9a1a7ce1d9e1e087018b SHA512 4c8c34ae8668bcfa5167c2d2af006fc46b461a5dafb3ec5b64cb8cdf2a830c22ddb5cf806c93b1404f60dabf91b4153724947fa2d2c494376f20e637eeed5018
 AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe464d672d00ecf5b5fffd349a6affcd8ae3ea0ba06160be72f31cfa2d918c01050e83640fb9956917dc0 SHA512 088d91cd77e614f7857d65496f5b6d486741a8e3358b3e13bcd4203d35a76fa3aa390f658065e2826145525b6e83fcd33f8365a873e99b522f3ab7e8615ed364
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
diff --git a/sys-cluster/kube-proxy/files/kube-proxy-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kube-proxy/files/kube-proxy-1.28.0-make-gomaxprocs-install-optional.patch
deleted file mode 100644
index 1a8935b31c9c..000000000000
--- a/sys-cluster/kube-proxy/files/kube-proxy-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
-