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

2 files changed, 0 insertions, 79 deletions

diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 3bf320e66ef7..3e30ee7b013d 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,4 +1,3 @@
-AUX kubectl-1.28.0-make-gomaxprocs-install-optional.patch 2835 BLAKE2B 964759a3af2afced4d5ff2ed59b1e94c2912a85ce560f3dac4e0ea59b1e308ee7b35f6d5435524e6e407d2032a1bd8783fb0b4787dbb22cfa9ace9ff723b1c40 SHA512 88b369bfda14eb03f9957f4b9105a565fa6f821e20b4743941f12f7e5b005cdef4184e0c09d54102b811e08a27f1725b0dc36e29e331f8802b7eaf52db1ce00f
 DIST kubernetes-1.24.17.tar.gz 38157141 BLAKE2B 2a4c68946a446ff9f0adce53960a4282f85c4235efbd2e3f749892e7d3b3cba4e4b0ea3db770dd07772c862966da8f0b339338fa54dbb1860df424f66c24b7b0 SHA512 d5a1356d5937afcede59a54835456db7883f193ba46711a8c6a87636a7f79995458245cbe5b3b89a6c5f668febaf17ba82a21f80e49e68c86e8b87ffe4138b54
 DIST kubernetes-1.25.13.tar.gz 38481625 BLAKE2B 5c820f6907581286565cc250d63878c441eb15064badb6bfb02c646f5a98473f15916cf423975f9dfca6fef0a055d5bca073ff9bdefaafe0c54ce758f1781978 SHA512 fef096489879fce03355a965fbad8680c7904714fd87747d13b489f7d8052a5ca243ce7b5965282150222f8ffc2d2dbc8e41ef3f11c5de2f4009507cb0ded9d0
 DIST kubernetes-1.25.14.tar.gz 38489922 BLAKE2B f5bcd1cdee5427e1f5732bbed834a5255e5ee7cbcd0c3d7f6b36993a1c85efefe2acf9a5c8262853a5b95cdcb57ffe23a3bae8cc65a80ee19383720b4479b60a SHA512 d62ce89540c431132056d379af7ed8581afa9830801cb5d9e7741a20fd1285922d3cf671ab9dcb239420c4a19d6edeee1f24f29521681cc184cf4a71a25e53d2
diff --git a/sys-cluster/kubectl/files/kubectl-1.28.0-make-gomaxprocs-install-optional.patch b/sys-cluster/kubectl/files/kubectl-1.28.0-make-gomaxprocs-install-optional.patch
deleted file mode 100644
index 1a8935b31c9c..000000000000
--- a/sys-cluster/kubectl/files/kubectl-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
-