From d1f4e787c63ea24cae8918b7b8d24df610973d3b Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Tue, 8 Jan 2019 16:22:03 -0800 Subject: [PATCH 1/4] Don't error if delete fails: there may not be a cluster to delete --- test/integration/iso_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/iso_test.go b/test/integration/iso_test.go index 7ebead934409..5bb66166b39d 100644 --- a/test/integration/iso_test.go +++ b/test/integration/iso_test.go @@ -28,7 +28,7 @@ func TestISO(t *testing.T) { minikubeRunner := NewMinikubeRunner(t) - minikubeRunner.RunCommand("delete", true) + minikubeRunner.RunCommand("delete", false) minikubeRunner.Start() t.Run("permissions", testMountPermissions) From b2831c871e450ec1a9a113192db91738ee4079b3 Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Tue, 8 Jan 2019 16:22:21 -0800 Subject: [PATCH 2/4] Update crio-bin to v1.13.0 --- deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash | 1 + deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 c56d6f28b9aa..06daededb7c7 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash @@ -1,3 +1,4 @@ sha256 d310d52706262009af886dbd3e8dcd09a339cdc3b57dc22a9121e6d6a87d2921 v1.8.4.tar.gz sha256 9f79cee99e272c9cfc561ae31235d84d4da59fd5c8b3d3ab6623bf9a92d90c5a v1.10.0.tar.gz sha256 09e53fd550f4f10108879131ee6b8ef1c367ce71a73dcf6350c4cc898751d8c1 v1.11.8.tar.gz +sha256 92588998dbb79002c38f65f84602b5659f0d0ef1cd36b1a568a2e40269b66816 v1.13.0.tar.gz \ No newline at end of file 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 5b90c816df79..9fd5bef86f89 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.11.8 +CRIO_BIN_VERSION = v1.13.0 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 From 89ff60328818dd51004fc447140a7b5045ddc2bc Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Wed, 9 Jan 2019 10:40:44 -0800 Subject: [PATCH 3/4] Add newline --- deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 06daededb7c7..2e0f76e2084e 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash @@ -1,4 +1,4 @@ sha256 d310d52706262009af886dbd3e8dcd09a339cdc3b57dc22a9121e6d6a87d2921 v1.8.4.tar.gz sha256 9f79cee99e272c9cfc561ae31235d84d4da59fd5c8b3d3ab6623bf9a92d90c5a v1.10.0.tar.gz sha256 09e53fd550f4f10108879131ee6b8ef1c367ce71a73dcf6350c4cc898751d8c1 v1.11.8.tar.gz -sha256 92588998dbb79002c38f65f84602b5659f0d0ef1cd36b1a568a2e40269b66816 v1.13.0.tar.gz \ No newline at end of file +sha256 92588998dbb79002c38f65f84602b5659f0d0ef1cd36b1a568a2e40269b66816 v1.13.0.tar.gz From 666a902ba7207da7b338f0e45eafd2140316186c Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Fri, 11 Jan 2019 10:53:29 -0800 Subject: [PATCH 4/4] Add newline --- deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 06daededb7c7..2e0f76e2084e 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash @@ -1,4 +1,4 @@ sha256 d310d52706262009af886dbd3e8dcd09a339cdc3b57dc22a9121e6d6a87d2921 v1.8.4.tar.gz sha256 9f79cee99e272c9cfc561ae31235d84d4da59fd5c8b3d3ab6623bf9a92d90c5a v1.10.0.tar.gz sha256 09e53fd550f4f10108879131ee6b8ef1c367ce71a73dcf6350c4cc898751d8c1 v1.11.8.tar.gz -sha256 92588998dbb79002c38f65f84602b5659f0d0ef1cd36b1a568a2e40269b66816 v1.13.0.tar.gz \ No newline at end of file +sha256 92588998dbb79002c38f65f84602b5659f0d0ef1cd36b1a568a2e40269b66816 v1.13.0.tar.gz