diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-10-04 23:52:39 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-10-04 23:52:39 +0100 |
commit | 1b2c0d19f75523db182b267901484f87abf732cf (patch) | |
tree | 3c4832e97c3846189d07c64c2eba333bf33b8ab2 /sys-cluster/kubelet | |
parent | dd851ab76c56a249df7a0ec052acd90940bc014f (diff) |
gentoo auto-resync : 04:10:2023 - 23:52:39
Diffstat (limited to 'sys-cluster/kubelet')
-rw-r--r-- | sys-cluster/kubelet/Manifest | 1 | ||||
-rw-r--r-- | sys-cluster/kubelet/files/kubelet-1.28.0-make-gomaxprocs-install-optional.patch | 78 |
2 files changed, 0 insertions, 79 deletions
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest index 124c34f3ee7b..8cc7409a4105 100644 --- a/sys-cluster/kubelet/Manifest +++ b/sys-cluster/kubelet/Manifest @@ -1,4 +1,3 @@ -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 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 deleted file mode 100644 index 1a8935b31c9c..000000000000 --- a/sys-cluster/kubelet/files/kubelet-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 - |