From af5b2c7c2d26929be9259843a01665e141d05be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sat, 4 May 2019 16:10:10 +0200 Subject: [PATCH 1/6] Upgrade podman to 1.2.0 --- deploy/iso/minikube-iso/package/podman/podman.hash | 1 + deploy/iso/minikube-iso/package/podman/podman.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/package/podman/podman.hash b/deploy/iso/minikube-iso/package/podman/podman.hash index cc41e16d76..1b6c74cf1a 100644 --- a/deploy/iso/minikube-iso/package/podman/podman.hash +++ b/deploy/iso/minikube-iso/package/podman/podman.hash @@ -3,3 +3,4 @@ sha256 004d2695cf3de1802b3a1fc70bb03115e33ffe943477c49558b682313cb4fca2 v0.6.1.t sha256 0b478f4918b984480b2f24ac5df1f45e31bca798dd8e2364bb56b2810b2ccff6 v0.7.4.tar.gz sha256 065d2ef4cbbbcb87a7be5e1b3adb36d932819bafae7ccc26ad80f653b4328692 v0.9.3.tar.gz sha256 f7a462563dd587208eff3c3c0689bc4d01071a8f7933bec2a13126be123f63a8 v1.0.0.tar.gz +sha256 b4d6843e13c0f2f1557ab20b4364bb42ea9102442ee3f1be806c06128aa687d8 v1.2.0.tar.gz diff --git a/deploy/iso/minikube-iso/package/podman/podman.mk b/deploy/iso/minikube-iso/package/podman/podman.mk index 539d519280..87e0a0af4e 100644 --- a/deploy/iso/minikube-iso/package/podman/podman.mk +++ b/deploy/iso/minikube-iso/package/podman/podman.mk @@ -1,5 +1,5 @@ -PODMAN_VERSION = v1.0.0 -PODMAN_COMMIT = 82e80110c3f2d8728745c47e340f3bee4d408846 +PODMAN_VERSION = v1.2.0 +PODMAN_COMMIT = 3bd528e583182b4249f3e6bbd8497a8831d89950 PODMAN_SITE = https://github.com/containers/libpod/archive PODMAN_SOURCE = $(PODMAN_VERSION).tar.gz PODMAN_LICENSE = Apache-2.0 From 3cc43762982cdde96f5fbbe065b9b969e26d6d56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sat, 4 May 2019 16:14:05 +0200 Subject: [PATCH 2/6] Upgrade crio to 1.14.0 --- deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash | 1 + deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk | 5 +++-- 2 files changed, 4 insertions(+), 2 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 67943232c2..6510f46d75 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash @@ -3,3 +3,4 @@ sha256 9f79cee99e272c9cfc561ae31235d84d4da59fd5c8b3d3ab6623bf9a92d90c5a v1.10.0. sha256 09e53fd550f4f10108879131ee6b8ef1c367ce71a73dcf6350c4cc898751d8c1 v1.11.8.tar.gz sha256 92588998dbb79002c38f65f84602b5659f0d0ef1cd36b1a568a2e40269b66816 v1.13.0.tar.gz sha256 48e7cf64a757d62a3edf214e1b93b74d99f090ca924f956ede2494a260eab2db v1.13.1.tar.gz +sha256 7435c4745017f06c260973b049440d924efe65b0df008d14175dfb8f5e23b599 v1.14.0.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 3bd741cda7..9eb4f8ef44 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,8 @@ # ################################################################################ -CRIO_BIN_VERSION = v1.13.1 +CRIO_BIN_VERSION = v1.14.0 +CRIO_BIN_COMMIT = 0b8a2dffba86ae8ef3316ff2030ed226c3f652a1 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 @@ -28,7 +29,7 @@ endef define CRIO_BIN_BUILD_CMDS mkdir -p $(@D)/bin - $(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=/usr binaries + $(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) GIT_COMMIT=$(CRIO_BIN_COMMIT) PREFIX=/usr binaries endef define CRIO_BIN_INSTALL_TARGET_CMDS From c272f683ea555c213982f4f9fd3fee9943641d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sat, 4 May 2019 22:07:20 +0200 Subject: [PATCH 3/6] The cri-o config changed the type of a field Trying to run with the old config gives fatal runtime error: toml: cannot load TOML value of type string into a Go slice --- deploy/iso/minikube-iso/package/crio-bin/crio.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/package/crio-bin/crio.conf b/deploy/iso/minikube-iso/package/crio-bin/crio.conf index 726b8dc181..e07c111cbe 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio.conf +++ b/deploy/iso/minikube-iso/package/crio-bin/crio.conf @@ -157,5 +157,7 @@ registries = [ # files are stored. network_dir = "/etc/cni/net.d/" -# plugin_dir is where CNI plugin binaries are stored. -plugin_dir = "/opt/cni/bin/" +# Paths to directories where CNI plugin binaries are located. +plugin_dir = [ + "/opt/cni/bin/", +] From 732c6d7e9bb210a33357950e35dbe4d9b85f933c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sat, 4 May 2019 22:35:56 +0200 Subject: [PATCH 4/6] Need to create the cni directory, or cri-o cries config validation: invalid network_dir: stat /etc/cni/net.d/: no such file or directory --- .../board/coreos/minikube/rootfs-overlay/etc/cni/net.d/.keep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/cni/net.d/.keep diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/cni/net.d/.keep b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/cni/net.d/.keep new file mode 100644 index 0000000000..e69de29bb2 From dff8960a3cecfdb095ed5a57ef1a575d4af551f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Mon, 20 May 2019 22:23:26 +0200 Subject: [PATCH 5/6] Upgrade podman to 1.3.1 --- deploy/iso/minikube-iso/package/podman/podman.hash | 2 ++ deploy/iso/minikube-iso/package/podman/podman.mk | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/deploy/iso/minikube-iso/package/podman/podman.hash b/deploy/iso/minikube-iso/package/podman/podman.hash index 1b6c74cf1a..7f270bdbb3 100644 --- a/deploy/iso/minikube-iso/package/podman/podman.hash +++ b/deploy/iso/minikube-iso/package/podman/podman.hash @@ -4,3 +4,5 @@ sha256 0b478f4918b984480b2f24ac5df1f45e31bca798dd8e2364bb56b2810b2ccff6 v0.7.4.t sha256 065d2ef4cbbbcb87a7be5e1b3adb36d932819bafae7ccc26ad80f653b4328692 v0.9.3.tar.gz sha256 f7a462563dd587208eff3c3c0689bc4d01071a8f7933bec2a13126be123f63a8 v1.0.0.tar.gz sha256 b4d6843e13c0f2f1557ab20b4364bb42ea9102442ee3f1be806c06128aa687d8 v1.2.0.tar.gz +sha256 548a82b62ff183ca9e68f164779d6ded94fce07261242ceb96faa267fcecf56b v1.3.0.tar.gz +sha256 7ccbfa80900cd438468986911038da4c38382ef507a2fa717217faefb738fbc4 v1.3.1.tar.gz diff --git a/deploy/iso/minikube-iso/package/podman/podman.mk b/deploy/iso/minikube-iso/package/podman/podman.mk index 87e0a0af4e..77f7c780c8 100644 --- a/deploy/iso/minikube-iso/package/podman/podman.mk +++ b/deploy/iso/minikube-iso/package/podman/podman.mk @@ -1,5 +1,5 @@ -PODMAN_VERSION = v1.2.0 -PODMAN_COMMIT = 3bd528e583182b4249f3e6bbd8497a8831d89950 +PODMAN_VERSION = v1.3.1 +PODMAN_COMMIT = 7210727e205c333af9a2d0ed0bb66adcf92a6369 PODMAN_SITE = https://github.com/containers/libpod/archive PODMAN_SOURCE = $(PODMAN_VERSION).tar.gz PODMAN_LICENSE = Apache-2.0 From d6434317c726e7b2c18a0e8af8494049c9f81285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Mon, 20 May 2019 22:31:35 +0200 Subject: [PATCH 6/6] Upgrade crio to 1.14.1 --- deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash | 1 + deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk | 4 ++-- 2 files changed, 3 insertions(+), 2 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 6510f46d75..dc0e1a46d4 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash @@ -4,3 +4,4 @@ sha256 09e53fd550f4f10108879131ee6b8ef1c367ce71a73dcf6350c4cc898751d8c1 v1.11.8. sha256 92588998dbb79002c38f65f84602b5659f0d0ef1cd36b1a568a2e40269b66816 v1.13.0.tar.gz sha256 48e7cf64a757d62a3edf214e1b93b74d99f090ca924f956ede2494a260eab2db v1.13.1.tar.gz sha256 7435c4745017f06c260973b049440d924efe65b0df008d14175dfb8f5e23b599 v1.14.0.tar.gz +sha256 1f6f72b1f89d4286b2d5b54a48f4d5ed4c0c01065d484635dcb343a706feb743 v1.14.1.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 9eb4f8ef44..9331619cdf 100644 --- a/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk +++ b/deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRIO_BIN_VERSION = v1.14.0 -CRIO_BIN_COMMIT = 0b8a2dffba86ae8ef3316ff2030ed226c3f652a1 +CRIO_BIN_VERSION = v1.14.1 +CRIO_BIN_COMMIT = b7644f67e6383cc862b3e37fb74fba334b0b2721 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