[gentoo-commits] repo/gentoo:master commit in: sys-cluster/kube-proxy/files/

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/kube-proxy/files/

[Manuel Rüger]

commit:     92c4bcb021f31238e34ee109a519759f20109ce0
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 14:54:10 2017 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 14:54:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92c4bcb0

sys-cluster/kube-proxy: Fix pidfile path

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 sys-cluster/kube-proxy/files/kube-proxy.initd | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-cluster/kube-proxy/files/kube-proxy.initd b/sys-cluster/kube-proxy/files/kube-proxy.initd
index 10d51f8785f..18a75adf0b6 100644
--- a/sys-cluster/kube-proxy/files/kube-proxy.initd
+++ b/sys-cluster/kube-proxy/files/kube-proxy.initd
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 description="Kubernetes Proxy service"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
+pidfile=${pidfile:-"/run/${SVCNAME}.pid"}
 user=${user:-root}
 group=${group:-root}
 
@@ -15,6 +15,5 @@ start_stop_daemon_args="--user ${user} --group ${group} \
 	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
 
 depend() {
-	need net
 	after net
 }

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/kube-proxy/files/

[Conrad Kostecki]

commit:     46d4067ed7e3ca4d6183e51ffd30b9b1598efc7e
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Sep 22 05:44:19 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Oct  4 21:43:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46d4067e

sys-cluster/kube-proxy: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...y-1.28.0-make-gomaxprocs-install-optional.patch | 78 ----------------------
 1 file changed, 78 deletions(-)

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
-