From 1e07a534c21e4149050227f32fd2a4d1d41cfe0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= <lucas@weave.works>
Date: Mon, 1 Jun 2020 18:19:09 +0300
Subject: [PATCH 1/3] Bump OS versions

---
 images/Makefile           | 9 ++++++---
 images/kubeadm/Dockerfile | 8 ++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/images/Makefile b/images/Makefile
index 8e93d93a2..d2554d953 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -82,8 +82,11 @@ build-all:
 	$(MAKE) ${OP} WHAT=opensuse      RELEASE=leap       IS_LATEST=true
 	$(MAKE) ${OP} WHAT=opensuse      RELEASE=tumbleweed
 	$(MAKE) ${OP} WHAT=ubuntu        RELEASE=16.04						IS_MANIFEST_LIST=0
-	$(MAKE) ${OP} WHAT=ubuntu        RELEASE=18.04      IS_LATEST=true	IS_MANIFEST_LIST=1 GOARCH=arm64
-	$(MAKE) ${OP} WHAT=ubuntu        RELEASE=18.04      IS_LATEST=true	IS_MANIFEST_LIST=1 GOARCH=amd64
+	$(MAKE) ${OP} WHAT=ubuntu        RELEASE=18.04      				IS_MANIFEST_LIST=1 GOARCH=arm64
+	$(MAKE) ${OP} WHAT=ubuntu        RELEASE=18.04      				IS_MANIFEST_LIST=1 GOARCH=amd64
 	$(MAKE) ${OP} WHAT=ubuntu        RELEASE=19.04						IS_MANIFEST_LIST=0
-	$(MAKE) ${OP} WHAT=centos        RELEASE=7          IS_LATEST=true
+	$(MAKE) ${OP} WHAT=ubuntu        RELEASE=20.04      IS_LATEST=true	IS_MANIFEST_LIST=1 GOARCH=arm64
+	$(MAKE) ${OP} WHAT=ubuntu        RELEASE=20.04      IS_LATEST=true	IS_MANIFEST_LIST=1 GOARCH=amd64
+	$(MAKE) ${OP} WHAT=centos        RELEASE=7
+	$(MAKE) ${OP} WHAT=centos        RELEASE=8          IS_LATEST=true
 	$(MAKE) ${OP} WHAT=kubeadm
diff --git a/images/kubeadm/Dockerfile b/images/kubeadm/Dockerfile
index d5d4b3123..a624916fa 100644
--- a/images/kubeadm/Dockerfile
+++ b/images/kubeadm/Dockerfile
@@ -1,4 +1,4 @@
-FROM weaveworks/ignite-ubuntu:18.04
+FROM weaveworks/ignite-ubuntu:20.04
 # Install dependencies. Use containerd for running the containers (for better performance)
 RUN apt-get update && apt-get install -y --no-install-recommends \
         apt-transport-https \
@@ -8,10 +8,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         jq \
     && apt-get clean
 
-# Install k8s v1.15.0 locally
-ENV KUBERNETES_VERSION=v1.15.0
+# Install k8s v1.18.1 locally
+ENV KUBERNETES_VERSION=v1.18.1
 COPY install.sh /
-RUN /install.sh install release/stable-1.15 ${KUBERNETES_VERSION}
+RUN /install.sh install release/stable-1.18 ${KUBERNETES_VERSION}
 # Docker sets this automatically, but not containerd.
 # It is required when running kubeadm.
 RUN echo "net.ipv4.ip_forward=1" > /etc/sysctl.conf

From 4eb8d954846f927a863a94636826f63fc8f1d610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= <lucas@weave.works>
Date: Mon, 1 Jun 2020 18:59:43 +0300
Subject: [PATCH 2/3] Bump kernel image versions

---
 images/kernel/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/kernel/Makefile b/images/kernel/Makefile
index f142b2d9d..1acaad853 100644
--- a/images/kernel/Makefile
+++ b/images/kernel/Makefile
@@ -1,7 +1,7 @@
 # Check https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/refs/ for updates
 REGISTRY?=weaveworks
 IMAGE_NAME?=${REGISTRY}/ignite-kernel
-KERNEL_VERSIONS ?= 4.14.166 4.19.97 5.4.13
+KERNEL_VERSIONS ?= 4.14.182 4.19.125 5.4.43
 GOARCH?=amd64
 GOARCH_LIST = amd64 arm64
 

From 8ba03250e4c9596b5beca5749f72295397a7cd8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= <lucas@weave.works>
Date: Mon, 1 Jun 2020 19:00:01 +0300
Subject: [PATCH 3/3] pull image if it doesn't exist

---
 images/kernel/upgrade-config.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/images/kernel/upgrade-config.sh b/images/kernel/upgrade-config.sh
index 409e5a162..97b0b2772 100755
--- a/images/kernel/upgrade-config.sh
+++ b/images/kernel/upgrade-config.sh
@@ -21,6 +21,7 @@ if [[ ${FROM} != ${TO} ]]; then
     cp ${FROM} ${TO}
 fi
 
+docker pull ${KERNEL_BUILDER_IMAGE}
 docker run -it \
     ${ARCH_PARAMETER} \
 	-v $(pwd)/${TO}:/tmp/.config \