kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add crictl from cri-tools, to minikube.iso 

We don't need critest, because it requires go anyway.
But kubeadm insists on crictl being available in path.
pull/2663/head
Anders F Björklund 2018-01-07 19:45:42 +01:00 committed by dlorenc
parent 3932663f3b
commit 60ec8bdf06
4 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deploy/iso/minikube-iso/package/Config.in
View File

@ -3,6 +3,7 @@ menu "System tools"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/runc-master/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/kpod/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cri-tools/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/automount/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/docker-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-bin/Config.in"

5
deploy/iso/minikube-iso/package/cri-tools/Config.in Normal file
View File

@ -0,0 +1,5 @@
config BR2_PACKAGE_CRI_TOOLS
bool "cri-tools"
default y
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS

3
deploy/iso/minikube-iso/package/cri-tools/cri-tools.hash Normal file
View File

@ -0,0 +1,3 @@
sha256 e83b5a8ff6fc2c98c3463600e74a86d7dbbea6330f883cd5663cbd59641a8086 v0.2.tar.gz
sha256 2c8e45414d5804628f557171d622ca3e4a55dfc1f2de0cd33bcba98e863342d1 v1.0.0-alpha.0.tar.gz
sha256 688cd566e11f09247e8135ac1ee65e5afb3ea3303c00569c5e1e265e3b2c68f6 v1.0.0-beta.0.tar.gz

35
deploy/iso/minikube-iso/package/cri-tools/cri-tools.mk Normal file
View File

@ -0,0 +1,35 @@
################################################################################
#
# cri-tools
#
################################################################################
CRI_TOOLS_VERSION = v1.0.0-beta.0
CRI_TOOLS_SITE = https://github.com/kubernetes-incubator/cri-tools/archive
CRI_TOOLS_SOURCE = $(CRI_TOOLS_VERSION).tar.gz
CRI_TOOLS_LICENSE = Apache-2.0
CRI_TOOLS_LICENSE_FILES = LICENSE
CRI_TOOLS_DEPENDENCIES =
CRI_TOOLS_GOPATH = $(@D)/_output
CRI_TOOLS_ENV = \
CGO_ENABLED=1 \
GOPATH="$(CRI_TOOLS_GOPATH)" \
PATH=$(CRI_TOOLS_GOPATH)/bin:$(BR_PATH)
define CRI_TOOLS_CONFIGURE_CMDS
mkdir -p $(CRI_TOOLS_GOPATH)/src/github.com/kubernetes-incubator
ln -sf $(@D) $(CRI_TOOLS_GOPATH)/src/github.com/kubernetes-incubator/cri-tools
endef
define CRI_TOOLS_BUILD_CMDS
$(CRI_TOOLS_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) crictl
endef
define CRI_TOOLS_INSTALL_TARGET_CMDS
$(INSTALL) -Dm755 \
$(CRI_TOOLS_GOPATH)/bin/crictl \
$(TARGET_DIR)/usr/bin/crictl
endef
$(eval $(generic-package))