From d2ac7ae28e65b4d59b7be0685ba2ebdde9c84930 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Wed, 7 Nov 2018 15:05:51 -0800 Subject: [PATCH 1/2] Upgrade to crio v1.11.8 --- deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash | 1 + deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash index 9781d351b961..c56d6f28b9aa 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash @@ -1,2 +1,3 @@ sha256 d310d52706262009af886dbd3e8dcd09a339cdc3b57dc22a9121e6d6a87d2921 v1.8.4.tar.gz sha256 9f79cee99e272c9cfc561ae31235d84d4da59fd5c8b3d3ab6623bf9a92d90c5a v1.10.0.tar.gz +sha256 09e53fd550f4f10108879131ee6b8ef1c367ce71a73dcf6350c4cc898751d8c1 v1.11.8.tar.gz diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk index 73231183f7aa..8b608054a9e3 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -CRIO_BIN_VERSION = v1.10.0 +CRIO_BIN_VERSION = v1.11.8 CRIO_BIN_SITE = https://github.com/kubernetes-incubator/cri-o/archive CRIO_BIN_SOURCE = $(CRIO_BIN_VERSION).tar.gz CRIO_BIN_DEPENDENCIES = host-go libgpgme @@ -29,9 +29,7 @@ endef define CRIO_BIN_BUILD_CMDS 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 + $(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=/usr binaries endef define CRIO_BIN_INSTALL_TARGET_CMDS From f7ac166f6be4d74c32b20e755aa6969175a95d15 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Mon, 12 Nov 2018 14:44:26 -0800 Subject: [PATCH 2/2] crio is now in kubernetes-sigs rather than kubernetes-incubator. --- deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk index 8b608054a9e3..5b90c816df79 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk @@ -5,7 +5,7 @@ ################################################################################ CRIO_BIN_VERSION = v1.11.8 -CRIO_BIN_SITE = https://github.com/kubernetes-incubator/cri-o/archive +CRIO_BIN_SITE = https://github.com/kubernetes-sigs/cri-o/archive CRIO_BIN_SOURCE = $(CRIO_BIN_VERSION).tar.gz CRIO_BIN_DEPENDENCIES = host-go libgpgme CRIO_BIN_GOPATH = $(@D)/_output @@ -22,8 +22,8 @@ define CRIO_BIN_USERS endef define CRIO_BIN_CONFIGURE_CMDS - mkdir -p $(CRIO_BIN_GOPATH)/src/github.com/kubernetes-incubator - ln -sf $(@D) $(CRIO_BIN_GOPATH)/src/github.com/kubernetes-incubator/cri-o + mkdir -p $(CRIO_BIN_GOPATH)/src/github.com/kubernetes-sigs + ln -sf $(@D) $(CRIO_BIN_GOPATH)/src/github.com/kubernetes-sigs/cri-o $(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install.tools DESTDIR=$(TARGET_DIR) PREFIX=$(TARGET_DIR)/usr endef