crio v1.8.4, runc update, kpod update

deploy/addons/coredns/coreDNS-controller.yaml

@@ -25,7 +25,7 @@ spec:
         effect: NoSchedule
       containers:
       - name: coredns
-        image: coredns/coredns:0.9.10
+        image: registry.hub.docker.com/coredns/coredns:0.9.10
         imagePullPolicy: IfNotPresent
         resources:
           limits:

deploy/addons/efk/elasticsearch-rc.yaml

@@ -58,7 +58,7 @@ spec:
         - name: MINIMUM_MASTER_NODES
           value: "1"
       initContainers:
-      - image: alpine:3.6
+      - image: registry.hub.docker.com/library/alpine:3.6
         command: ["/sbin/sysctl", "-w", "vm.max_map_count=262144"]
         name: elasticsearch-logging-init
         securityContext:

deploy/addons/registry-creds/registry-creds-rc.yaml

@@ -21,7 +21,7 @@ spec:
         addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:
-      - image: upmcenterprises/registry-creds:1.8
+      - image: registry.hub.docker.com/upmcenterprises/registry-creds:1.8
         name: registry-creds
         imagePullPolicy: Always
         env:

deploy/addons/registry/registry-rc.yaml

@@ -17,7 +17,7 @@ spec:
         addonmanager.kubernetes.io/mode: Reconcile
     spec:
       containers:
-      - image: registry:2.6.1
+      - image: registry.hub.docker.com/library/registry:2.6.1
         imagePullPolicy: IfNotPresent
         name: registry
         ports:

deploy/iso/minikube-iso/package/Config.in

@@ -1,6 +1,7 @@
 menu "System tools"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/rkt-bin/Config.in"
     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/automount/Config.in"
     source "$BR2_EXTERNAL_MINIKUBE_PATH/package/docker-bin/Config.in"

deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash

@@ -1 +1 @@
-sha256 e1d8b0273b77f1ebe9f844ecf29ae03241de92a5d44a06facee66b8242cf6ce8 v1.0.0.tar.gz
+sha256 d310d52706262009af886dbd3e8dcd09a339cdc3b57dc22a9121e6d6a87d2921 v1.8.4.tar.gz

deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk

@@ -4,12 +4,13 @@
 #
 ################################################################################
 
-CRIO_BIN_VERSION = v1.0.0
+CRIO_BIN_VERSION = v1.8.4
 CRIO_BIN_SITE = https://github.com/kubernetes-incubator/cri-o/archive
 CRIO_BIN_SOURCE = $(CRIO_BIN_VERSION).tar.gz
 CRIO_BIN_DEPENDENCIES = libgpgme
 CRIO_BIN_GOPATH = $(@D)/_output
 CRIO_BIN_ENV = \
+	CGO_ENABLED=1 \
 	GOPATH="$(CRIO_BIN_GOPATH)" \
 	PATH=$(CRIO_BIN_GOPATH)/bin:$(BR_PATH)
 
@@ -26,27 +27,24 @@ define CRIO_BIN_CONFIGURE_CMDS
 endef
 
 define CRIO_BIN_BUILD_CMDS
-	$(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) binaries PREFIX=/usr BUILDTAGS="containers_image_ostree_stub" 
+	mkdir -p $(@D)/bin
+	$(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=/usr pause
+	$(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=/usr crio
+	$(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=/usr conmon
 endef
 
 define CRIO_BIN_INSTALL_TARGET_CMDS
 	mkdir -p $(TARGET_DIR)/usr/share/containers/oci/hooks.d
 	mkdir -p $(TARGET_DIR)/etc/containers/oci/hooks.d
 
 	$(INSTALL) -Dm755 \
-		$(@D)/crio \
+		$(@D)/bin/crio \
 		$(TARGET_DIR)/usr/bin/crio
 	$(INSTALL) -Dm755 \
-		$(@D)/crioctl \
-		$(TARGET_DIR)/usr/bin/crioctl
-	$(INSTALL) -Dm755 \
-		$(@D)/kpod \
-		$(TARGET_DIR)/usr/bin/kpod
-	$(INSTALL) -Dm755 \
-		$(@D)/conmon/conmon \
+		$(@D)/bin/conmon \
 		$(TARGET_DIR)/usr/libexec/crio/conmon
 	$(INSTALL) -Dm755 \
-		$(@D)/pause/pause \
+		$(@D)/bin/pause \
 		$(TARGET_DIR)/usr/libexec/crio/pause
 	$(INSTALL) -Dm644 \
 		$(@D)/seccomp.json \
@@ -64,7 +62,7 @@ endef
 
 define CRIO_BIN_INSTALL_INIT_SYSTEMD
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install.systemd DESTDIR=$(TARGET_DIR) PREFIX=$(TARGET_DIR)/usr
-	$(INSTALL) -Dm755 \
+	$(INSTALL) -Dm644 \
 		$(BR2_EXTERNAL_MINIKUBE_PATH)/package/crio-bin/crio.service \
 		$(TARGET_DIR)/usr/lib/systemd/system/crio.service
 	$(call link-service,crio.service)

deploy/iso/minikube-iso/package/crio-bin/crio.conf

@@ -99,9 +99,20 @@ cgroup_manager = "cgroupfs"
 # hooks_dir_path is the oci hooks directory for automatically executed hooks
 hooks_dir_path = "/usr/share/containers/oci/hooks.d"
 
+# default_mounts is the mounts list to be mounted for the container when created
+default_mounts = [
+]
+
 # pids_limit is the number of processes allowed in a container
 pids_limit = 1024
 
+# enable using a shared PID namespace for containers in a pod
+enable_shared_pid_namespace = false
+
+# log_size_max is the max limit for the container log size in bytes.
+# Negative values indicate that no limit is imposed.
+log_size_max = -1
+
 # The "crio.image" table contains settings pertaining to the
 # management of OCI images.
 [crio.image]

deploy/iso/minikube-iso/package/crio-bin/crio.service

@@ -12,9 +12,9 @@ EnvironmentFile=/var/run/minikube/env
 Environment=GOTRACEBACK=crash
 ExecStartPre=/bin/mkdir -p ${PERSISTENT_DIR}/var/lib/containers
 ExecStart=/usr/bin/crio \
-          $CRIO_OPTIONS \
-	  $CRIO_MINIKUBE_OPTIONS \
-	  --root ${PERSISTENT_DIR}/var/lib/containers
+    $CRIO_OPTIONS \
+    $CRIO_MINIKUBE_OPTIONS \
+    --root ${PERSISTENT_DIR}/var/lib/containers
 ExecReload=/bin/kill -s HUP $MAINPID
 TasksMax=8192
 LimitNOFILE=1048576

deploy/iso/minikube-iso/package/kpod/Config.in

@@ -0,0 +1,9 @@
+config BR2_PACKAGE_KPOD
+	bool "kpod"
+	default y
+	depends on BR2_x86_64
+	depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_LIBSECCOMP
+	select BR2_PACKAGE_LIBGPGME

deploy/iso/minikube-iso/package/kpod/kpod.hash

@@ -0,0 +1,2 @@
+# Locally computed
+sha256 b8607ac0fc4cea5f66cdf6d628bf74550d4bfb62ed279c965499691a87a1bcc6 b85d0fa4ea5b6515088a3475a56a44c0cee5bfc5.tar.gz

deploy/iso/minikube-iso/package/kpod/kpod.mk

@@ -0,0 +1,31 @@
+KPOD_VERSION = b85d0fa4ea5b6515088a3475a56a44c0cee5bfc5
+KPOD_SITE = https://github.com/projectatomic/libpod/archive
+KPOD_SOURCE = $(KPOD_VERSION).tar.gz
+KPOD_LICENSE = Apache-2.0
+KPOD_LICENSE_FILES = LICENSE
+
+KPOD_DEPENDENCIES = host-go
+
+KPOD_GOPATH = $(@D)/_output
+KPOD_BIN_ENV = \
+	CGO_ENABLED=1 \
+	GOPATH="$(KPOD_GOPATH)" \
+	PATH=$(KPOD_GOPATH)/bin:$(BR_PATH)
+
+
+define KPOD_CONFIGURE_CMDS
+	mkdir -p $(KPOD_GOPATH)/src/github.com/projectatomic
+	ln -sf $(@D) $(KPOD_GOPATH)/src/github.com/projectatomic/libpod
+	$(KPOD_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install.tools DESTDIR=$(TARGET_DIR) PREFIX=$(TARGET_DIR)/usr
+endef
+
+define KPOD_BUILD_CMDS
+	mkdir -p $(@D)/bin
+	$(KPOD_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=/usr kpod
+endef
+
+define KPOD_INSTALL_TARGET_CMDS
+	$(INSTALL) -Dm755 $(@D)/bin/kpod $(TARGET_DIR)/usr/bin/kpod
+endef
+
+$(eval $(generic-package))

deploy/iso/minikube-iso/package/runc-master/runc-master.hash

@@ -1,2 +1,2 @@
 # Locally computed
-sha256 e9ad8aa5590f65a23326b7e9944d8b9881fa002ccb4a8e2cd40712a89a40ee45  runc-master-593914b8bd5448a93f7c3e4902a03408b6d5c0ce.tar.gz
+sha256 fc780966c4d70c275a87930e93cda4210e63a490eabfb0fa5f2fe70be6dcdc58 0fdc908bf1ee7b7da85f9e5adbd1e256060f2486.tar.gz

deploy/iso/minikube-iso/package/runc-master/runc-master.mk

@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-RUNC_MASTER_VERSION = 593914b8bd5448a93f7c3e4902a03408b6d5c0ce
-RUNC_MASTER_SITE = $(call github,opencontainers,runc,$(RUNC_MASTER_VERSION))
+RUNC_MASTER_VERSION = 0fdc908bf1ee7b7da85f9e5adbd1e256060f2486
+RUNC_MASTER_SITE = https://github.com/opencontainers/runc/archive
+RUNC_MASTER_SOURCE = $(RUNC_MASTER_VERSION).tar.gz
 RUNC_MASTER_LICENSE = Apache-2.0
 RUNC_MASTER_LICENSE_FILES = LICENSE