From 0d707dd03d6ad98ee249c038555ffb84f328a0d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Mudrini=C4=87?= <mudrinic.mare@gmail.com>
Date: Fri, 19 Mar 2021 12:57:39 +0100
Subject: [PATCH 1/2] Install cri-tools on Amazon Linux 2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
---
 pkg/scripts/funcs.go  |  1 +
 pkg/scripts/render.go | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkg/scripts/funcs.go b/pkg/scripts/funcs.go
index 0e3645057..dc6115402 100644
--- a/pkg/scripts/funcs.go
+++ b/pkg/scripts/funcs.go
@@ -88,6 +88,7 @@ const (
 	defaultLegacyDockerVersion     = "18.09.9"
 	defaultContainerdVersion       = "1.4.3"
 	defaultAmazonContainerdVersion = "1.4.1"
+	defaultAmazonCrictlVersion     = "1.13.0"
 )
 
 type dockerConfig struct {
diff --git a/pkg/scripts/render.go b/pkg/scripts/render.go
index 2d6cc67da..d992544e6 100644
--- a/pkg/scripts/render.go
+++ b/pkg/scripts/render.go
@@ -65,20 +65,26 @@ var (
 
 		"yum-docker-ce-amzn": heredoc.Docf(`
 			{{- if or .FORCE .UPGRADE }}
-			sudo yum versionlock delete docker || true
+			sudo yum versionlock delete docker cri-tools || true
 			{{- end }}
 
+			{{ $CRICTL_VERSION_TO_INSTALL := "%s" }}
 			{{ $DOCKER_VERSION_TO_INSTALL := "%s" }}
 			{{ if semverCompare "< 1.17" .KUBERNETES_VERSION }}
 			{{ $DOCKER_VERSION_TO_INSTALL = "%s" }}
 			{{ end }}
 
-			sudo yum install -y docker-{{ $DOCKER_VERSION_TO_INSTALL }}ce*
-			sudo yum versionlock add docker
+			sudo yum install -y docker-{{ $DOCKER_VERSION_TO_INSTALL }}ce* cri-tools-{{ $CRICTL_VERSION_TO_INSTALL }}*
+			sudo yum versionlock add docker cri-tools
+
+			cat <<EOF | sudo tee /etc/crictl.yaml
+			runtime-endpoint: unix:///var/run/dockershim.sock
+			EOF
 
 			sudo systemctl daemon-reload
 			sudo systemctl enable --now docker
 		`,
+			defaultAmazonCrictlVersion,
 			defaultAmazonDockerVersion,
 			defaultLegacyDockerVersion,
 		),
@@ -194,11 +200,11 @@ var (
 
 		"yum-containerd-amzn": heredoc.Docf(`
 			{{- if or .FORCE .UPGRADE }}
-			sudo yum versionlock delete containerd || true
+			sudo yum versionlock delete containerd cri-tools || true
 			{{- end }}
 
-			sudo yum install -y containerd-%s*
-			sudo yum versionlock add containerd
+			sudo yum install -y containerd-%s* cri-tools-%s*
+			sudo yum versionlock add containerd cri-tools
 
 			cat <<EOF | sudo tee /etc/containerd/config.toml
 			{{ containerdCfg .INSECURE_REGISTRY -}}
@@ -220,6 +226,7 @@ var (
 			sudo systemctl restart containerd
 			`,
 			defaultAmazonContainerdVersion,
+			defaultAmazonCrictlVersion,
 		),
 	}
 )

From b91d96fe2b9bc2dc11407289bb17478f74e9abe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Mudrini=C4=87?= <mudrinic.mare@gmail.com>
Date: Fri, 19 Mar 2021 15:03:37 +0100
Subject: [PATCH 2/2] Update test fixtures
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
---
 .../testdata/TestKubeadmAmazonLinux-force.golden      | 11 ++++++++---
 .../TestKubeadmAmazonLinux-overwrite_registry.golden  |  9 +++++++--
 ...eadmAmazonLinux-overwrite_registry_insecure.golden |  9 +++++++--
 .../testdata/TestKubeadmAmazonLinux-proxy.golden      |  9 +++++++--
 .../testdata/TestKubeadmAmazonLinux-simple.golden     |  9 +++++++--
 .../testdata/TestKubeadmAmazonLinux-v1.16.1.golden    |  9 +++++++--
 .../TestKubeadmAmazonLinux-with_containerd.golden     |  4 ++--
 ...inux-with_containerd_with_insecure_registry.golden |  4 ++--
 .../TestUpgradeKubeadmAndCNIAmazonLinux.golden        | 11 ++++++++---
 .../TestUpgradeKubeletAndKubectlAmazonLinux.golden    | 11 ++++++++---
 10 files changed, 63 insertions(+), 23 deletions(-)

diff --git a/pkg/scripts/testdata/TestKubeadmAmazonLinux-force.golden b/pkg/scripts/testdata/TestKubeadmAmazonLinux-force.golden
index 3a57dc7cc..d471f8889 100644
--- a/pkg/scripts/testdata/TestKubeadmAmazonLinux-force.golden
+++ b/pkg/scripts/testdata/TestKubeadmAmazonLinux-force.golden
@@ -85,13 +85,18 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 EOF
 
 
-sudo yum versionlock delete docker || true
+sudo yum versionlock delete docker cri-tools || true
 
 
 
 
-sudo yum install -y docker-19.03.13ce*
-sudo yum versionlock add docker
+
+sudo yum install -y docker-19.03.13ce* cri-tools-1.13.0*
+sudo yum versionlock add docker cri-tools
+
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo systemctl daemon-reload
 sudo systemctl enable --now docker
diff --git a/pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry.golden b/pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry.golden
index b3f705990..e998afa09 100644
--- a/pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry.golden
+++ b/pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry.golden
@@ -89,8 +89,13 @@ EOF
 
 
 
-sudo yum install -y docker-19.03.13ce*
-sudo yum versionlock add docker
+
+sudo yum install -y docker-19.03.13ce* cri-tools-1.13.0*
+sudo yum versionlock add docker cri-tools
+
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo systemctl daemon-reload
 sudo systemctl enable --now docker
diff --git a/pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry_insecure.golden b/pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry_insecure.golden
index edd5faec0..21a22198f 100644
--- a/pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry_insecure.golden
+++ b/pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry_insecure.golden
@@ -92,8 +92,13 @@ EOF
 
 
 
-sudo yum install -y docker-19.03.13ce*
-sudo yum versionlock add docker
+
+sudo yum install -y docker-19.03.13ce* cri-tools-1.13.0*
+sudo yum versionlock add docker cri-tools
+
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo systemctl daemon-reload
 sudo systemctl enable --now docker
diff --git a/pkg/scripts/testdata/TestKubeadmAmazonLinux-proxy.golden b/pkg/scripts/testdata/TestKubeadmAmazonLinux-proxy.golden
index 27bd65792..c7170b6ee 100644
--- a/pkg/scripts/testdata/TestKubeadmAmazonLinux-proxy.golden
+++ b/pkg/scripts/testdata/TestKubeadmAmazonLinux-proxy.golden
@@ -89,8 +89,13 @@ EOF
 
 
 
-sudo yum install -y docker-19.03.13ce*
-sudo yum versionlock add docker
+
+sudo yum install -y docker-19.03.13ce* cri-tools-1.13.0*
+sudo yum versionlock add docker cri-tools
+
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo systemctl daemon-reload
 sudo systemctl enable --now docker
diff --git a/pkg/scripts/testdata/TestKubeadmAmazonLinux-simple.golden b/pkg/scripts/testdata/TestKubeadmAmazonLinux-simple.golden
index b3f705990..e998afa09 100644
--- a/pkg/scripts/testdata/TestKubeadmAmazonLinux-simple.golden
+++ b/pkg/scripts/testdata/TestKubeadmAmazonLinux-simple.golden
@@ -89,8 +89,13 @@ EOF
 
 
 
-sudo yum install -y docker-19.03.13ce*
-sudo yum versionlock add docker
+
+sudo yum install -y docker-19.03.13ce* cri-tools-1.13.0*
+sudo yum versionlock add docker cri-tools
+
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo systemctl daemon-reload
 sudo systemctl enable --now docker
diff --git a/pkg/scripts/testdata/TestKubeadmAmazonLinux-v1.16.1.golden b/pkg/scripts/testdata/TestKubeadmAmazonLinux-v1.16.1.golden
index 8e3f68ee5..d1ca110e0 100644
--- a/pkg/scripts/testdata/TestKubeadmAmazonLinux-v1.16.1.golden
+++ b/pkg/scripts/testdata/TestKubeadmAmazonLinux-v1.16.1.golden
@@ -91,8 +91,13 @@ EOF
 
 
 
-sudo yum install -y docker-18.09.9ce*
-sudo yum versionlock add docker
+
+sudo yum install -y docker-18.09.9ce* cri-tools-1.13.0*
+sudo yum versionlock add docker cri-tools
+
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo systemctl daemon-reload
 sudo systemctl enable --now docker
diff --git a/pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd.golden b/pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd.golden
index 63a28000a..b8cc32eb2 100644
--- a/pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd.golden
+++ b/pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd.golden
@@ -73,8 +73,8 @@ sudo yum install -y \
 
 
 
-sudo yum install -y containerd-1.4.1*
-sudo yum versionlock add containerd
+sudo yum install -y containerd-1.4.1* cri-tools-1.13.0*
+sudo yum versionlock add containerd cri-tools
 
 cat <<EOF | sudo tee /etc/containerd/config.toml
 version = 2
diff --git a/pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd_with_insecure_registry.golden b/pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd_with_insecure_registry.golden
index 61809b95d..3df74f141 100644
--- a/pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd_with_insecure_registry.golden
+++ b/pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd_with_insecure_registry.golden
@@ -73,8 +73,8 @@ sudo yum install -y \
 
 
 
-sudo yum install -y containerd-1.4.1*
-sudo yum versionlock add containerd
+sudo yum install -y containerd-1.4.1* cri-tools-1.13.0*
+sudo yum versionlock add containerd cri-tools
 
 cat <<EOF | sudo tee /etc/containerd/config.toml
 version = 2
diff --git a/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIAmazonLinux.golden b/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIAmazonLinux.golden
index 36e9732be..ffed4ed5b 100644
--- a/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIAmazonLinux.golden
+++ b/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIAmazonLinux.golden
@@ -85,13 +85,18 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 EOF
 
 
-sudo yum versionlock delete docker || true
+sudo yum versionlock delete docker cri-tools || true
 
 
 
 
-sudo yum install -y docker-19.03.13ce*
-sudo yum versionlock add docker
+
+sudo yum install -y docker-19.03.13ce* cri-tools-1.13.0*
+sudo yum versionlock add docker cri-tools
+
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo systemctl daemon-reload
 sudo systemctl enable --now docker
diff --git a/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlAmazonLinux.golden b/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlAmazonLinux.golden
index d12c127b4..20b7b94ed 100644
--- a/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlAmazonLinux.golden
+++ b/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlAmazonLinux.golden
@@ -85,13 +85,18 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 EOF
 
 
-sudo yum versionlock delete docker || true
+sudo yum versionlock delete docker cri-tools || true
 
 
 
 
-sudo yum install -y docker-19.03.13ce*
-sudo yum versionlock add docker
+
+sudo yum install -y docker-19.03.13ce* cri-tools-1.13.0*
+sudo yum versionlock add docker cri-tools
+
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo systemctl daemon-reload
 sudo systemctl enable --now docker