[gentoo-commits] repo/gentoo:master commit in: sys-cluster/kube-controller-manager/files/, sys-cluster/kube-controller-manager/
commit: 0ccc53bac04500fcb0d4cb915b838b310a96b668
Author: William Hubbs gentoo org>
AuthorDate: Wed Aug 23 15:02:06 2023 +
Commit: William Hubbs gentoo org>
CommitDate: Wed Aug 23 15:02:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ccc53ba
sys-cluster/kube-controller-manager: make gomaxprocs install optional
Bug: https://bugs.gentoo.org/912781
Signed-off-by: William Hubbs gentoo.org>
...r-1.28.0-make-gomaxprocs-install-optional.patch | 78 ++
.../kube-controller-manager-1.28.0.ebuild | 4 ++
2 files changed, 82 insertions(+)
diff --git
a/sys-cluster/kube-controller-manager/files/kube-controller-manager-1.28.0-make-gomaxprocs-install-optional.patch
b/sys-cluster/kube-controller-manager/files/kube-controller-manager-1.28.0-make-gomaxprocs-install-optional.patch
new file mode 100644
index ..1a8935b31c9c
--- /dev/null
+++
b/sys-cluster/kube-controller-manager/files/kube-controller-manager-1.28.0-make-gomaxprocs-install-optional.patch
@@ -0,0 +1,78 @@
+From cce3f6ffa796ea416021b0d62567a3f52b979567 Mon Sep 17 00:00:00 2001
+From: Jordan Liggitt
+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
+
diff --git
a/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.0.ebuild
b/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.0.ebuild
index dc4ca2df138b..683ee2008eeb 100644
--- a/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.0.ebuild
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.28.0.ebuild
@@ -22,6 +22,10 @@ BDEPEND=">=dev-lang/go-1.20"
RESTRICT+=" test"
S="${WORKDIR}/kubernetes-${PV}"
+PATCHES=(
+ "${FILESDIR}"/${P}-make-gomaxprocs-install-optional.patch
+ )
+
src_compile() {
CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/kube-controller-manager/files/, sys-cluster/kube-controller-manager/
commit: f535fcc74abfb6fa05e3a31f8a6a55a5f4e10cdb
Author: Manuel Rüger gentoo org>
AuthorDate: Sat Aug 12 12:45:57 2017 +
Commit: Manuel Rüger gentoo org>
CommitDate: Sat Aug 12 12:45:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f535fcc7
sys-cluster/kube-controller-manager: Initial version
Package-Manager: Portage-2.3.6, Repoman-2.3.3
sys-cluster/kube-controller-manager/Manifest | 1 +
.../files/kube-controller-manager.confd| 9 +
.../files/kube-controller-manager.initd| 24 +++
.../files/kube-controller-manager.logrotated | 7
.../kube-controller-manager-1.7.3.ebuild | 47 ++
sys-cluster/kube-controller-manager/metadata.xml | 11 +
6 files changed, 99 insertions(+)
diff --git a/sys-cluster/kube-controller-manager/Manifest
b/sys-cluster/kube-controller-manager/Manifest
new file mode 100644
index 000..e169459929b
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -0,0 +1 @@
+DIST kubernetes-1.7.3.tar.gz 22019646 SHA256
7f84e08c2944865247c3fee26b010452e4a315a1cdd7983ff59d151f17167b13 SHA512
9c239cff3c3a18cc384079599abcffd7475052cff0d237e7b5b298229e08dea083c47284470ed5158484c9611c029aecca496391730793251389d05ce86d4146
WHIRLPOOL
35e6aaf16d9d411865e0ca594373fd08178d78899e06b1bbea7ef494b8e94264068700eb498684d54e665385b515055f4dca6df4345dfecff073afbd98bfe645
diff --git
a/sys-cluster/kube-controller-manager/files/kube-controller-manager.confd
b/sys-cluster/kube-controller-manager/files/kube-controller-manager.confd
new file mode 100644
index 000..155c43a0756
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/files/kube-controller-manager.confd
@@ -0,0 +1,9 @@
+###
+# kubernetes system config
+#
+# The following values are used to configure the kube-controller-manager
+#
+
+# Add your own!
+command_args=""
+
diff --git
a/sys-cluster/kube-controller-manager/files/kube-controller-manager.initd
b/sys-cluster/kube-controller-manager/files/kube-controller-manager.initd
new file mode 100644
index 000..f2e52699c6d
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/files/kube-controller-manager.initd
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Kubernetes Controller Manager service"
+pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
+user=${user:-${SVCNAME}}
+group=${group:-${SVCNAME}}
+
+command="/usr/bin/kube-controller-manager"
+command_args="${command_args}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+ --stdout /var/log/${SVCNAME}/${SVCNAME}.log \
+ --stderr /var/log/${SVCNAME}/${SVCNAME}.log"
+
+depend() {
+ need net
+ after net
+}
+
+start_pre() {
+ checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
+}
diff --git
a/sys-cluster/kube-controller-manager/files/kube-controller-manager.logrotated
b/sys-cluster/kube-controller-manager/files/kube-controller-manager.logrotated
new file mode 100644
index 000..a74eca94abf
--- /dev/null
+++
b/sys-cluster/kube-controller-manager/files/kube-controller-manager.logrotated
@@ -0,0 +1,7 @@
+/var/log/kube-controller-manager/* {
+ missingok
+ size 5M
+ rotate 3
+ compress
+ copytruncate
+}
diff --git
a/sys-cluster/kube-controller-manager/kube-controller-manager-1.7.3.ebuild
b/sys-cluster/kube-controller-manager/kube-controller-manager-1.7.3.ebuild
new file mode 100644
index 000..e5ab12f1601
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.7.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="k8s.io/kubernetes"
+ARCHIVE_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz ->
kubernetes-${PV}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io;
+SRC_URI="${ARCHIVE_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="dev-go/go-bindata"
+
+RESTRICT="test"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+ default
+ sed -i -e "/vendor\/github.com\/jteeuwen\/go-bindata\/go-bindata/d"
src/${EGO_PN}/hack/lib/golang.sh || die
+ sed -i -e "/export PATH/d" src/${EGO_PN}/hack/generate-bindata.sh || die
+}
+
+src_compile() {
+ LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -j1 -C src/${EGO_PN}
WHAT=cmd/${PN}
+}
+
+src_install() {
+ pushd src/${EGO_PN} || die
+ dobin _output/bin/${PN}
+ popd || die
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
