Skip to content

Commit

Permalink
update kubernetes-controller-manager & kube-scheduler to 1.26.0 versi…
Browse files Browse the repository at this point in the history
…on + enhancements
  • Loading branch information
nerzhul committed Jan 17, 2023
1 parent 9018dea commit b8ea8c3
Show file tree
Hide file tree
Showing 10 changed files with 132 additions and 22 deletions.
31 changes: 23 additions & 8 deletions net/kube-controller-manager/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PORTNAME= kube-controller-manager
PORTVERSION= 1.13.3
PORTVERSION= 1.26.0
DISTVERSIONPREFIX= v
PORTREVISION= 8
PORTREVISION= 1
CATEGORIES= net

MAINTAINER= loic.blot@unix-experience.fr
Expand All @@ -20,14 +20,29 @@ USE_GITHUB= yes
GH_ACCOUNT= kubernetes
GH_PROJECT= kubernetes

BUILD_DATE= 2019-01-30T00:00:00Z

GO_PKGNAME= k8s.io/kubernetes
GO_TARGET= ${GO_PKGNAME}/cmd/kube-controller-manager
GO_BUILDFLAGS= -ldflags="-X k8s.io/kubernetes/pkg/version.gitMajor=${PORTVERSION:R:R} \
-X k8s.io/kubernetes/pkg/version.gitMinor=${PORTVERSION:R:E} \
-X k8s.io/kubernetes/pkg/version.buildDate=${BUILD_DATE} \
-X k8s.io/kubernetes/pkg/version.gitVersion=${DISTVERSIONPREFIX}${PORTVERSION}"

BUILD_DATE= $$(date +'%Y-%m-%dT%H:%M:%SZ')

GO_BUILDFLAGS= -ldflags="-X k8s.io/kubernetes/vendor/k8s.io/client-go/pkg/version.buildDate=${BUILD_DATE} \
-X k8s.io/kubernetes/vendor/k8s.io/component-base/version.buildDate=${BUILD_DATE} \
-X k8s.io/client-go/pkg/version.buildDate=${BUILD_DATE} \
-X k8s.io/component-base/version.buildDate=${BUILD_DATE} \
-X k8s.io/kubernetes/vendor/k8s.io/client-go/pkg/version.gitMinor=${PORTVERSION:R:E} \
-X k8s.io/kubernetes/vendor/k8s.io/component-base/version.gitMinor=${PORTVERSION:R:E} \
-X k8s.io/client-go/pkg/version.gitMinor=${PORTVERSION:R:E} \
-X k8s.io/component-base/version.gitMinor=${PORTVERSION:R:E} \
-X k8s.io/kubernetes/vendor/k8s.io/client-go/pkg/version.gitMajor=${PORTVERSION:R:R} \
-X k8s.io/kubernetes/vendor/k8s.io/component-base/version.gitMajor=${PORTVERSION:R:R} \
-X k8s.io/client-go/pkg/version.gitMajor=${PORTVERSION:R:R} \
-X k8s.io/component-base/version.gitMajor=${PORTVERSION:R:R} \
-X k8s.io/kubernetes/vendor/k8s.io/client-go/pkg/version.gitVersion=${DISTVERSIONPREFIX}${PORTVERSION} \
-X k8s.io/kubernetes/vendor/k8s.io/component-base/version.gitVersion=${DISTVERSIONPREFIX}${PORTVERSION} \
-X k8s.io/client-go/pkg/version.gitVersion=${DISTVERSIONPREFIX}${PORTVERSION} \
-X k8s.io/component-base/version.gitVersion=${DISTVERSIONPREFIX}${PORTVERSION}"

USE_RC_SUBR= kube-controller-manager

PLIST_FILES= bin/${PORTNAME}

Expand Down
6 changes: 3 additions & 3 deletions net/kube-controller-manager/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1550216251
SHA256 (kubernetes-kubernetes-v1.13.3_GH0.tar.gz) = 9dc072cb7fa2aeb4ed6ee5e22e0a18eb323898af1c490c3a526d969313c483b3
SIZE (kubernetes-kubernetes-v1.13.3_GH0.tar.gz) = 28781320
TIMESTAMP = 1670573554
SHA256 (kubernetes-kubernetes-v1.26.0_GH0.tar.gz) = a0de781db6d09d91f39306740420f150c5912606f52e4c9a859649f4313fe508
SIZE (kubernetes-kubernetes-v1.26.0_GH0.tar.gz) = 40269668
24 changes: 24 additions & 0 deletions net/kube-controller-manager/files/kube-controller-manager.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/sh
#
# PROVIDE: kube-controller-manager
# REQUIRE: DAEMON
# KEYWORD: shutdown

# Add the following lines to /etc/rc.conf to enable kube-controller-manager:
#
# kube-controller-manager_enable="YES"

. /etc/rc.subr

name="kube_controller_manager"
rcvar="kube_controller_manager_enable"

load_rc_config $name
: ${kube_controller_manager_enable:=no}
: ${kube_controller_manager_args:="--bind-address=0.0.0.0 --v=2"}

pidfile="/var/run/${name}.pid"
command="/usr/sbin/daemon"
command_args="-P ${pidfile} -r -S -t ${name} -T ${name} /usr/local/bin/kube-controller-manager ${kube_controller_manager_args}"

run_rc_command "$1"
10 changes: 10 additions & 0 deletions net/kube-controller-manager/pkg-message
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
{ type: install
message: <<EOM
**** You need set kube_controller_manager_args rcvar to make Kubernetes
Controller Manager work properly.
See https://v1-24.docs.kubernetes.io/docs/reference/command-line-tools-reference/kube-controller-manager/
for more informations
EOM
}
]
35 changes: 27 additions & 8 deletions net/kube-scheduler/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PORTNAME= kube-scheduler
PORTVERSION= 1.13.3
PORTVERSION= 1.26.0
DISTVERSIONPREFIX= v
PORTREVISION= 8
PORTREVISION= 1
CATEGORIES= net

MAINTAINER= loic.blot@unix-experience.fr
Expand All @@ -20,15 +20,34 @@ USE_GITHUB= yes
GH_ACCOUNT= kubernetes
GH_PROJECT= kubernetes

BUILD_DATE= 2019-01-30T00:00:00Z

GO_PKGNAME= k8s.io/kubernetes
GO_TARGET= ${GO_PKGNAME}/cmd/kube-scheduler
GO_BUILDFLAGS= -ldflags="-X k8s.io/kubernetes/pkg/version.gitMajor=${PORTVERSION:R:R} \
-X k8s.io/kubernetes/pkg/version.gitMinor=${PORTVERSION:R:E} \
-X k8s.io/kubernetes/pkg/version.buildDate=${BUILD_DATE} \
-X k8s.io/kubernetes/pkg/version.gitVersion=${DISTVERSIONPREFIX}${PORTVERSION}"

BUILD_DATE= $$(date +'%Y-%m-%dT%H:%M:%SZ')

GO_BUILDFLAGS= -ldflags="-X k8s.io/kubernetes/vendor/k8s.io/client-go/pkg/version.buildDate=${BUILD_DATE} \
-X k8s.io/kubernetes/vendor/k8s.io/component-base/version.buildDate=${BUILD_DATE} \
-X k8s.io/client-go/pkg/version.buildDate=${BUILD_DATE} \
-X k8s.io/component-base/version.buildDate=${BUILD_DATE} \
-X k8s.io/kubernetes/vendor/k8s.io/client-go/pkg/version.gitMinor=${PORTVERSION:R:E} \
-X k8s.io/kubernetes/vendor/k8s.io/component-base/version.gitMinor=${PORTVERSION:R:E} \
-X k8s.io/client-go/pkg/version.gitMinor=${PORTVERSION:R:E} \
-X k8s.io/component-base/version.gitMinor=${PORTVERSION:R:E} \
-X k8s.io/kubernetes/vendor/k8s.io/client-go/pkg/version.gitMajor=${PORTVERSION:R:R} \
-X k8s.io/kubernetes/vendor/k8s.io/component-base/version.gitMajor=${PORTVERSION:R:R} \
-X k8s.io/client-go/pkg/version.gitMajor=${PORTVERSION:R:R} \
-X k8s.io/component-base/version.gitMajor=${PORTVERSION:R:R} \
-X k8s.io/kubernetes/vendor/k8s.io/client-go/pkg/version.gitVersion=${DISTVERSIONPREFIX}${PORTVERSION} \
-X k8s.io/kubernetes/vendor/k8s.io/component-base/version.gitVersion=${DISTVERSIONPREFIX}${PORTVERSION} \
-X k8s.io/client-go/pkg/version.gitVersion=${DISTVERSIONPREFIX}${PORTVERSION} \
-X k8s.io/component-base/version.gitVersion=${DISTVERSIONPREFIX}${PORTVERSION}"

USE_RC_SUBR= kube-scheduler

PLIST_FILES= bin/${PORTNAME}

post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/etc/kubernetes
${CP} ${FILESDIR}/*.sample ${STAGEDIR}${PREFIX}/etc/kubernetes

.include <bsd.port.mk>
6 changes: 3 additions & 3 deletions net/kube-scheduler/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1550217672
SHA256 (kubernetes-kubernetes-v1.13.3_GH0.tar.gz) = 9dc072cb7fa2aeb4ed6ee5e22e0a18eb323898af1c490c3a526d969313c483b3
SIZE (kubernetes-kubernetes-v1.13.3_GH0.tar.gz) = 28781320
TIMESTAMP = 1670573058
SHA256 (kubernetes-kubernetes-v1.26.0_GH0.tar.gz) = a0de781db6d09d91f39306740420f150c5912606f52e4c9a859649f4313fe508
SIZE (kubernetes-kubernetes-v1.26.0_GH0.tar.gz) = 40269668
24 changes: 24 additions & 0 deletions net/kube-scheduler/files/kube-scheduler.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/sh
#
# PROVIDE: kube-scheduler
# REQUIRE: DAEMON
# KEYWORD: shutdown

# Add the following lines to /etc/rc.conf to enable kube-scheduler:
#
# kube-scheduler_enable="YES"

. /etc/rc.subr

name="kube_scheduler"
rcvar="kube_scheduler_enable"

load_rc_config $name
: ${kube_scheduler_enable:=no}
: ${kube_scheduler_args:="--config=/usr/local/etc/kubernetes/scheduler.yaml --bind-address=0.0.0.0 --v=2"}

pidfile="/var/run/${name}.pid"
command="/usr/sbin/daemon"
command_args="-P ${pidfile} -r -S -t ${name} -T ${name} /usr/local/bin/kube-scheduler ${kube_scheduler_args}"

run_rc_command "$1"
8 changes: 8 additions & 0 deletions net/kube-scheduler/files/scheduler.yaml.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
apiVersion: kubescheduler.config.k8s.io/v1beta3
kind: KubeSchedulerConfiguration
clientConnection:
kubeconfig: "/usr/local/etc/kubernetes/scheduler.kubeconfig"
leaderElection:
leaderElect: true
enableProfiling: false
9 changes: 9 additions & 0 deletions net/kube-scheduler/pkg-message
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[
{ type: install
message: <<EOM
**** You need to adapt /usr/local/etc/kubernetes/scheduler.yaml
and provide a valid kubeconfig file in order to make Kubernetes scheduler
work properly.
EOM
}
]
1 change: 1 addition & 0 deletions net/kube-scheduler/pkg-plist
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@sample etc/kubernetes/scheduler.yaml.sample

0 comments on commit b8ea8c3

Please sign in to comment.