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

Install crictl from binary instead of from source 

Since we already install docker and cni from binary
pull/3160/head
Anders F Björklund 2018-09-24 19:59:11 +02:00
parent 0f98509bef
commit 16be159cbd
7 changed files with 24 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@ menu "System tools"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/runc-master/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/podman/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/crictl-bin/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
View File

@ -1,5 +0,0 @@
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

1
deploy/iso/minikube-iso/package/cri-tools/cri-tools.hash
View File

@ -1 +0,0 @@
sha256 a357c67c891896032865f7a34f7ec330e5a00fe7f20b6d8be50399b91c99a4ac v1.11.1.tar.gz

36
deploy/iso/minikube-iso/package/cri-tools/cri-tools.mk
View File

@ -1,36 +0,0 @@
################################################################################
#
# cri-tools
#
################################################################################
CRI_TOOLS_VERSION = v1.11.1
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 = host-go
CRI_TOOLS_GOPATH = $(@D)/_output
CRI_TOOLS_ENV = \
CGO_ENABLED=1 \
GOPATH="$(CRI_TOOLS_GOPATH)" \
GOBIN="$(CRI_TOOLS_GOPATH)/bin" \
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))

4
deploy/iso/minikube-iso/package/crictl-bin/Config.in Normal file
View File

@ -0,0 +1,4 @@
config BR2_PACKAGE_CRICTL_BIN
bool "crictl-bin"
default y
depends on BR2_x86_64

1
deploy/iso/minikube-iso/package/crictl-bin/crictl-bin.hash Normal file
View File

@ -0,0 +1 @@
sha256 ccf83574556793ceb01717dc91c66b70f183c60c2bbec70283939aae8fdef768 crictl-v1.11.1-linux-amd64.tar.gz

18
deploy/iso/minikube-iso/package/crictl-bin/crictl-bin.mk Normal file
View File

@ -0,0 +1,18 @@
################################################################################
#
# crictl-bin
#
################################################################################
CRICTL_BIN_VERSION = v1.11.1
CRICTL_BIN_SITE = https://github.com/kubernetes-sigs/cri-tools/releases/download/$(CRICTL_BIN_VERSION)
CRICTL_BIN_SOURCE = crictl-$(CRICTL_BIN_VERSION)-linux-amd64.tar.gz
CRICTL_BIN_STRIP_COMPONENTS = 0
define CRICTL_BIN_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 \
$(@D)/crictl \
$(TARGET_DIR)/usr/bin/crictl
endef
$(eval $(generic-package))