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

Merge pull request #1760 from r2d4/cni-v0.6.0-rc.1 

Update cni-bin to v0.6.0-rc1
pull/1761/head
Matt Rickard 2017-07-26 19:33:14 -07:00 committed by GitHub
parent 8837045970 41fdd53e1a
commit dcfbb28899
6 changed files with 128 additions and 19 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/automount/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/docker-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/cni-plugins-bin/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/hv-kvp-daemon/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/openvmtools10/Config.in"
source "$BR2_EXTERNAL_MINIKUBE_PATH/package/vbox-guest/Config.in"

1
deploy/iso/minikube-iso/package/cni-bin/cni-bin.hash
View File

@ -1,2 +1,3 @@
sha256 b1ae09833a238c51161918a8849031efdb46cf0068ea5b752e362d9836e2af7d cni-v0.3.0.tgz
sha256 84c9a0a41b59211d560bef14bf3f53bb370156f9ac7762270b3848fed96e1be8 cni-v0.4.0.tgz
sha256 d1e3c693903d498fcb89076f66410167eaa6d81df4a1051eba7565672f896543 cni-amd64-v0.6.0-rc1.tgz

30
deploy/iso/minikube-iso/package/cni-bin/cni-bin.mk
View File

@ -4,34 +4,26 @@
#
################################################################################
CNI_BIN_VERSION = 0.4.0
CNI_BIN_SITE = https://github.com/containernetworking/cni/releases/download/v$(CNI_BIN_VERSION)
CNI_BIN_SOURCE = cni-v$(CNI_BIN_VERSION).tgz
CNI_BIN_VERSION = v0.6.0-rc1
CNI_BIN_SITE = https://github.com/containernetworking/cni/releases/download/$(CNI_BIN_VERSION)
CNI_BIN_SOURCE = cni-amd64-$(CNI_BIN_VERSION).tgz
define CNI_BIN_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 \
$(@D)/bridge \
$(TARGET_DIR)/opt/cni/bin/bridge
$(@D)/noop \
$(TARGET_DIR)/opt/cni/bin/noop
ln -sf \
../../opt/cni/bin/bridge \
$(TARGET_DIR)/usr/bin/bridge
../../opt/cni/bin/noop \
$(TARGET_DIR)/usr/bin/noop
$(INSTALL) -D -m 0755 \
$(@D)/host-local \
$(TARGET_DIR)/opt/cni/bin/host-local
$(@D)/noop \
$(TARGET_DIR)/opt/cni/bin/cnitool
ln -sf \
../../opt/cni/bin/host-local \
$(TARGET_DIR)/usr/bin/host-local
$(INSTALL) -D -m 0755 \
$(@D)/loopback \
$(TARGET_DIR)/opt/cni/bin/loopback
ln -sf \
../../opt/cni/bin/loopback \
$(TARGET_DIR)/usr/bin/loopback
../../opt/cni/bin/cnitool \
$(TARGET_DIR)/usr/bin/cnitool
endef
$(eval $(generic-package))

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

@ -0,0 +1,4 @@
config BR2_PACKAGE_CNI_PLUGINS_BIN
bool "cni-plugins-bin"
default y
depends on BR2_x86_64

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

@ -0,0 +1 @@
sha256 49f14413c62f77d0ce5751934a28b291c4f04af47e591631d00e787ebcd07875 cni-plugins-amd64-v0.6.0-rc1.tgz

110
deploy/iso/minikube-iso/package/cni-plugins-bin/cni-plugins-bin.mk Normal file
View File

@ -0,0 +1,110 @@
################################################################################
#
# cni-plugins-bin
#
################################################################################
CNI_PLUGINS_BIN_VERSION = v0.6.0-rc1
CNI_PLUGINS_BIN_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_BIN_VERSION)
CNI_PLUGINS_BIN_SOURCE = cni-plugins-amd64-$(CNI_PLUGINS_BIN_VERSION).tgz
define CNI_PLUGINS_BIN_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 \
$(@D)/bridge \
$(TARGET_DIR)/opt/cni/bin/bridge
ln -sf \
../../opt/cni/bin/bridge \
$(TARGET_DIR)/usr/bin/bridge
$(INSTALL) -D -m 0755 \
$(@D)/vlan \
$(TARGET_DIR)/opt/cni/bin/vlan
ln -sf \
../../opt/cni/bin/vlan \
$(TARGET_DIR)/usr/bin/vlan
$(INSTALL) -D -m 0755 \
$(@D)/tuning \
$(TARGET_DIR)/opt/cni/bin/tuning
ln -sf \
../../opt/cni/bin/tuning \
$(TARGET_DIR)/usr/bin/tuning
$(INSTALL) -D -m 0755 \
$(@D)/sample \
$(TARGET_DIR)/opt/cni/bin/sample
ln -sf \
../../opt/cni/bin/sample \
$(TARGET_DIR)/usr/bin/sample
$(INSTALL) -D -m 0755 \
$(@D)/ptp \
$(TARGET_DIR)/opt/cni/bin/ptp
ln -sf \
../../opt/cni/bin/ptp \
$(TARGET_DIR)/usr/bin/ptp
$(INSTALL) -D -m 0755 \
$(@D)/portmap \
$(TARGET_DIR)/opt/cni/bin/portmap
ln -sf \
../../opt/cni/bin/portmap \
$(TARGET_DIR)/usr/bin/portmap
$(INSTALL) -D -m 0755 \
$(@D)/macvlan \
$(TARGET_DIR)/opt/cni/bin/macvlan
ln -sf \
../../opt/cni/bin/macvlan \
$(TARGET_DIR)/usr/bin/macvlan
$(INSTALL) -D -m 0755 \
$(@D)/loopback \
$(TARGET_DIR)/opt/cni/bin/loopback
ln -sf \
../../opt/cni/bin/loopback \
$(TARGET_DIR)/usr/bin/loopback
$(INSTALL) -D -m 0755 \
$(@D)/ipvlan \
$(TARGET_DIR)/opt/cni/bin/ipvlan
ln -sf \
../../opt/cni/bin/ipvlan \
$(TARGET_DIR)/usr/bin/ipvlan
$(INSTALL) -D -m 0755 \
$(@D)/host-local \
$(TARGET_DIR)/opt/cni/bin/host-local
ln -sf \
../../opt/cni/bin/host-local \
$(TARGET_DIR)/usr/bin/host-local
$(INSTALL) -D -m 0755 \
$(@D)/flannel \
$(TARGET_DIR)/opt/cni/bin/flannel
ln -sf \
../../opt/cni/bin/flannel \
$(TARGET_DIR)/usr/bin/flannel
$(INSTALL) -D -m 0755 \
$(@D)/dhcp \
$(TARGET_DIR)/opt/cni/bin/dhcp
ln -sf \
../../opt/cni/bin/dhcp \
$(TARGET_DIR)/usr/bin/dhcp
endef
$(eval $(generic-package))