From fb01753e6f465d8af6c3f618ccab890e0d273ac2 Mon Sep 17 00:00:00 2001
From: Artiom Diomin <kron82@gmail.com>
Date: Fri, 3 Dec 2021 16:46:33 +0200
Subject: [PATCH] Update fixtures

Signed-off-by: Artiom Diomin <kron82@gmail.com>
---
 .../TestKubeadmAmazonLinux-force.golden       | 10 ++---
 ...beadmAmazonLinux-overwrite_registry.golden | 10 ++---
 ...onLinux-overwrite_registry_insecure.golden | 10 ++---
 .../TestKubeadmAmazonLinux-proxy.golden       | 10 ++---
 .../TestKubeadmAmazonLinux-simple.golden      | 10 ++---
 .../TestKubeadmAmazonLinux-v1.16.1.golden     | 10 ++---
 ...tKubeadmAmazonLinux-with_containerd.golden | 10 +++--
 ...h_containerd_with_insecure_registry.golden | 10 +++--
 .../testdata/TestKubeadmCentOS-force.golden   |  6 ++-
 ...estKubeadmCentOS-overwrite_registry.golden |  6 ++-
 ...mCentOS-overwrite_registry_insecure.golden |  6 ++-
 .../testdata/TestKubeadmCentOS-proxy.golden   |  6 ++-
 .../testdata/TestKubeadmCentOS-simple.golden  |  6 ++-
 .../testdata/TestKubeadmCentOS-v1.16.1.golden |  6 ++-
 .../TestKubeadmCentOS-with_containerd.golden  | 22 ++++-----
 ...h_containerd_with_insecure_registry.golden | 22 ++++-----
 ...estKubeadmDebian-overwrite_registry.golden |  5 ++-
 ...mDebian-overwrite_registry_insecure.golden |  5 ++-
 .../testdata/TestKubeadmDebian-simple.golden  |  5 ++-
 .../TestKubeadmDebian-with_containerd.golden  | 33 +++++---------
 ...h_containerd_with_insecure_registry.golden | 33 +++++---------
 .../testdata/TestKubeadmFlatcar-force.golden  | 10 ++++-
 ...stKubeadmFlatcar-overwrite_registry.golden | 10 ++++-
 ...Flatcar-overwrite_registry_insecure.golden | 10 ++++-
 .../testdata/TestKubeadmFlatcar-simple.golden | 10 ++++-
 .../TestKubeadmFlatcar-with_containerd.golden | 31 +++++++++++++
 .../TestMigrateToContainerd-flatcat.golden    | 45 +++++++++++++++++++
 ...igrateToContainerd-insecureRegistry.golden | 13 +++++-
 .../TestMigrateToContainerd-simple.golden     | 13 +++++-
 ...TestUpgradeKubeadmAndCNIAmazonLinux.golden | 10 ++---
 .../TestUpgradeKubeadmAndCNICentOS.golden     |  6 ++-
 .../TestUpgradeKubeadmAndCNIDebian.golden     |  5 ++-
 ...UpgradeKubeletAndKubectlAmazonLinux.golden | 10 ++---
 .../TestUpgradeKubeletAndKubectlCentOS.golden |  6 ++-
 .../TestUpgradeKubeletAndKubectlDebian.golden |  5 ++-
 35 files changed, 276 insertions(+), 149 deletions(-)

diff --git a/pkg/scripts/testdata/TestKubeadmAmazonLinux-force.golden b/pkg/scripts/testdata/TestKubeadmAmazonLinux-force.golden
index 816bbcbbc..a81ad0da1 100644
--- a/pkg/scripts/testdata/TestKubeadmAmazonLinux-force.golden
+++ b/pkg/scripts/testdata/TestKubeadmAmazonLinux-force.golden
@@ -71,7 +71,7 @@ sudo yum install -y \
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -84,6 +84,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo yum versionlock delete docker cri-tools containerd || true
 
@@ -92,11 +95,6 @@ sudo yum install -y \
 	containerd.io-1.4.* \
 	cri-tools-1.13.0
 sudo yum versionlock add docker cri-tools containerd
-
-cat <<EOF | sudo tee /etc/crictl.yaml
-runtime-endpoint: unix:///var/run/dockershim.sock
-EOF
-
 sudo systemctl daemon-reload
 sudo systemctl enable --now containerd
 sudo systemctl enable --now docker
diff --git a/pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry.golden b/pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry.golden
index 816bbcbbc..a81ad0da1 100644
--- a/pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry.golden
+++ b/pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry.golden
@@ -71,7 +71,7 @@ sudo yum install -y \
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -84,6 +84,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo yum versionlock delete docker cri-tools containerd || true
 
@@ -92,11 +95,6 @@ sudo yum install -y \
 	containerd.io-1.4.* \
 	cri-tools-1.13.0
 sudo yum versionlock add docker cri-tools containerd
-
-cat <<EOF | sudo tee /etc/crictl.yaml
-runtime-endpoint: unix:///var/run/dockershim.sock
-EOF
-
 sudo systemctl daemon-reload
 sudo systemctl enable --now containerd
 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 96f536723..c2868da37 100644
--- a/pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry_insecure.golden
+++ b/pkg/scripts/testdata/TestKubeadmAmazonLinux-overwrite_registry_insecure.golden
@@ -71,7 +71,7 @@ sudo yum install -y \
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -87,6 +87,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	]
 }
 EOF
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo yum versionlock delete docker cri-tools containerd || true
 
@@ -95,11 +98,6 @@ sudo yum install -y \
 	containerd.io-1.4.* \
 	cri-tools-1.13.0
 sudo yum versionlock add docker cri-tools containerd
-
-cat <<EOF | sudo tee /etc/crictl.yaml
-runtime-endpoint: unix:///var/run/dockershim.sock
-EOF
-
 sudo systemctl daemon-reload
 sudo systemctl enable --now containerd
 sudo systemctl enable --now docker
diff --git a/pkg/scripts/testdata/TestKubeadmAmazonLinux-proxy.golden b/pkg/scripts/testdata/TestKubeadmAmazonLinux-proxy.golden
index b799d148f..e217a4b8a 100644
--- a/pkg/scripts/testdata/TestKubeadmAmazonLinux-proxy.golden
+++ b/pkg/scripts/testdata/TestKubeadmAmazonLinux-proxy.golden
@@ -71,7 +71,7 @@ sudo yum install -y \
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -84,6 +84,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo yum versionlock delete docker cri-tools containerd || true
 
@@ -92,11 +95,6 @@ sudo yum install -y \
 	containerd.io-1.4.* \
 	cri-tools-1.13.0
 sudo yum versionlock add docker cri-tools containerd
-
-cat <<EOF | sudo tee /etc/crictl.yaml
-runtime-endpoint: unix:///var/run/dockershim.sock
-EOF
-
 sudo systemctl daemon-reload
 sudo systemctl enable --now containerd
 sudo systemctl enable --now docker
diff --git a/pkg/scripts/testdata/TestKubeadmAmazonLinux-simple.golden b/pkg/scripts/testdata/TestKubeadmAmazonLinux-simple.golden
index 816bbcbbc..a81ad0da1 100644
--- a/pkg/scripts/testdata/TestKubeadmAmazonLinux-simple.golden
+++ b/pkg/scripts/testdata/TestKubeadmAmazonLinux-simple.golden
@@ -71,7 +71,7 @@ sudo yum install -y \
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -84,6 +84,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo yum versionlock delete docker cri-tools containerd || true
 
@@ -92,11 +95,6 @@ sudo yum install -y \
 	containerd.io-1.4.* \
 	cri-tools-1.13.0
 sudo yum versionlock add docker cri-tools containerd
-
-cat <<EOF | sudo tee /etc/crictl.yaml
-runtime-endpoint: unix:///var/run/dockershim.sock
-EOF
-
 sudo systemctl daemon-reload
 sudo systemctl enable --now containerd
 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 e8c711d54..249791461 100644
--- a/pkg/scripts/testdata/TestKubeadmAmazonLinux-v1.16.1.golden
+++ b/pkg/scripts/testdata/TestKubeadmAmazonLinux-v1.16.1.golden
@@ -71,7 +71,7 @@ sudo yum install -y \
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -84,6 +84,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo yum versionlock delete docker cri-tools containerd || true
 
@@ -93,11 +96,6 @@ sudo yum install -y \
 	containerd.io-1.4.* \
 	cri-tools-1.13.0
 sudo yum versionlock add docker cri-tools containerd
-
-cat <<EOF | sudo tee /etc/crictl.yaml
-runtime-endpoint: unix:///var/run/dockershim.sock
-EOF
-
 sudo systemctl daemon-reload
 sudo systemctl enable --now containerd
 sudo systemctl enable --now docker
diff --git a/pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd.golden b/pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd.golden
index b2e4d0da1..f57f1778b 100644
--- a/pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd.golden
+++ b/pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd.golden
@@ -72,10 +72,8 @@ sudo yum install -y \
 
 
 
-sudo yum versionlock delete containerd cri-tools || true
-sudo yum install -y containerd-1.4.* cri-tools-1.13.0
-sudo yum versionlock add containerd cri-tools
 
+sudo mkdir -p $(dirname /etc/containerd/config.toml)
 cat <<EOF | sudo tee /etc/containerd/config.toml
 version = 2
 
@@ -94,12 +92,16 @@ SystemdCgroup = true
 [plugins."io.containerd.grpc.v1.cri".registry.mirrors]
 [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"]
 endpoint = ["https://registry-1.docker.io"]
-EOF
 
+EOF
 cat <<EOF | sudo tee /etc/crictl.yaml
 runtime-endpoint: unix:///run/containerd/containerd.sock
 EOF
 
+sudo yum versionlock delete containerd cri-tools || true
+sudo yum install -y containerd-1.4.* cri-tools-1.13.0
+sudo yum versionlock add containerd cri-tools
+
 sudo mkdir -p /etc/systemd/system/containerd.service.d
 cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/environment.conf
 [Service]
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 bfdb8e731..05bdd3d5f 100644
--- a/pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd_with_insecure_registry.golden
+++ b/pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd_with_insecure_registry.golden
@@ -72,10 +72,8 @@ sudo yum install -y \
 
 
 
-sudo yum versionlock delete containerd cri-tools || true
-sudo yum install -y containerd-1.4.* cri-tools-1.13.0
-sudo yum versionlock add containerd cri-tools
 
+sudo mkdir -p $(dirname /etc/containerd/config.toml)
 cat <<EOF | sudo tee /etc/containerd/config.toml
 version = 2
 
@@ -96,12 +94,16 @@ SystemdCgroup = true
 endpoint = ["http://127.0.0.1:5000"]
 [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"]
 endpoint = ["https://registry-1.docker.io"]
-EOF
 
+EOF
 cat <<EOF | sudo tee /etc/crictl.yaml
 runtime-endpoint: unix:///run/containerd/containerd.sock
 EOF
 
+sudo yum versionlock delete containerd cri-tools || true
+sudo yum install -y containerd-1.4.* cri-tools-1.13.0
+sudo yum versionlock add containerd cri-tools
+
 sudo mkdir -p /etc/systemd/system/containerd.service.d
 cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/environment.conf
 [Service]
diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-force.golden b/pkg/scripts/testdata/TestKubeadmCentOS-force.golden
index bea3deb65..e922639b5 100644
--- a/pkg/scripts/testdata/TestKubeadmCentOS-force.golden
+++ b/pkg/scripts/testdata/TestKubeadmCentOS-force.golden
@@ -71,7 +71,7 @@ sudo yum install -y \
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -84,7 +84,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
-
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo yum install -y yum-utils
 sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry.golden b/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry.golden
index eb046d5c9..16a7448d8 100644
--- a/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry.golden
+++ b/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry.golden
@@ -71,7 +71,7 @@ sudo yum install -y \
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -84,7 +84,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
-
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo yum install -y yum-utils
 sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry_insecure.golden b/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry_insecure.golden
index 407cdc7a9..797aaaba9 100644
--- a/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry_insecure.golden
+++ b/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry_insecure.golden
@@ -71,7 +71,7 @@ sudo yum install -y \
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -87,7 +87,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	]
 }
 EOF
-
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo yum install -y yum-utils
 sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-proxy.golden b/pkg/scripts/testdata/TestKubeadmCentOS-proxy.golden
index 1e21a0962..eb1c03b67 100644
--- a/pkg/scripts/testdata/TestKubeadmCentOS-proxy.golden
+++ b/pkg/scripts/testdata/TestKubeadmCentOS-proxy.golden
@@ -71,7 +71,7 @@ sudo yum install -y \
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -84,7 +84,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
-
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo yum install -y yum-utils
 sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-simple.golden b/pkg/scripts/testdata/TestKubeadmCentOS-simple.golden
index eb046d5c9..16a7448d8 100644
--- a/pkg/scripts/testdata/TestKubeadmCentOS-simple.golden
+++ b/pkg/scripts/testdata/TestKubeadmCentOS-simple.golden
@@ -71,7 +71,7 @@ sudo yum install -y \
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -84,7 +84,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
-
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo yum install -y yum-utils
 sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-v1.16.1.golden b/pkg/scripts/testdata/TestKubeadmCentOS-v1.16.1.golden
index f3bf03943..9cd0e1da8 100644
--- a/pkg/scripts/testdata/TestKubeadmCentOS-v1.16.1.golden
+++ b/pkg/scripts/testdata/TestKubeadmCentOS-v1.16.1.golden
@@ -71,7 +71,7 @@ sudo yum install -y \
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -84,7 +84,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
-
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo yum install -y yum-utils
 sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd.golden b/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd.golden
index 7e2adcd9c..25aed2f7b 100644
--- a/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd.golden
+++ b/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd.golden
@@ -73,15 +73,7 @@ sudo yum install -y \
 
 
 
-sudo yum install -y yum-utils
-sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
-sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
-
-
-sudo yum versionlock delete containerd.io || true
-sudo yum install -y containerd.io-1.4.*
-sudo yum versionlock add containerd.io
-
+sudo mkdir -p $(dirname /etc/containerd/config.toml)
 cat <<EOF | sudo tee /etc/containerd/config.toml
 version = 2
 
@@ -100,12 +92,22 @@ SystemdCgroup = true
 [plugins."io.containerd.grpc.v1.cri".registry.mirrors]
 [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"]
 endpoint = ["https://registry-1.docker.io"]
-EOF
 
+EOF
 cat <<EOF | sudo tee /etc/crictl.yaml
 runtime-endpoint: unix:///run/containerd/containerd.sock
 EOF
 
+
+sudo yum install -y yum-utils
+sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
+sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
+
+
+sudo yum versionlock delete containerd.io || true
+sudo yum install -y containerd.io-1.4.*
+sudo yum versionlock add containerd.io
+
 sudo mkdir -p /etc/systemd/system/containerd.service.d
 cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/environment.conf
 [Service]
diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd_with_insecure_registry.golden b/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd_with_insecure_registry.golden
index b6bf51b66..238b111ef 100644
--- a/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd_with_insecure_registry.golden
+++ b/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd_with_insecure_registry.golden
@@ -73,15 +73,7 @@ sudo yum install -y \
 
 
 
-sudo yum install -y yum-utils
-sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
-sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
-
-
-sudo yum versionlock delete containerd.io || true
-sudo yum install -y containerd.io-1.4.*
-sudo yum versionlock add containerd.io
-
+sudo mkdir -p $(dirname /etc/containerd/config.toml)
 cat <<EOF | sudo tee /etc/containerd/config.toml
 version = 2
 
@@ -102,12 +94,22 @@ SystemdCgroup = true
 endpoint = ["http://127.0.0.1:5000"]
 [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"]
 endpoint = ["https://registry-1.docker.io"]
-EOF
 
+EOF
 cat <<EOF | sudo tee /etc/crictl.yaml
 runtime-endpoint: unix:///run/containerd/containerd.sock
 EOF
 
+
+sudo yum install -y yum-utils
+sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
+sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
+
+
+sudo yum versionlock delete containerd.io || true
+sudo yum install -y containerd.io-1.4.*
+sudo yum versionlock add containerd.io
+
 sudo mkdir -p /etc/systemd/system/containerd.service.d
 cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/environment.conf
 [Service]
diff --git a/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry.golden b/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry.golden
index c6396d85f..871bdfee4 100644
--- a/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry.golden
+++ b/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry.golden
@@ -65,7 +65,7 @@ cni_ver="0.8.7*"
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -78,6 +78,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
diff --git a/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry_insecure.golden b/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry_insecure.golden
index 45ef0ee64..8c7e3c3a3 100644
--- a/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry_insecure.golden
+++ b/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry_insecure.golden
@@ -65,7 +65,7 @@ cni_ver="0.8.7*"
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -81,6 +81,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	]
 }
 EOF
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
diff --git a/pkg/scripts/testdata/TestKubeadmDebian-simple.golden b/pkg/scripts/testdata/TestKubeadmDebian-simple.golden
index c6396d85f..871bdfee4 100644
--- a/pkg/scripts/testdata/TestKubeadmDebian-simple.golden
+++ b/pkg/scripts/testdata/TestKubeadmDebian-simple.golden
@@ -65,7 +65,7 @@ cni_ver="0.8.7*"
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -78,6 +78,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
diff --git a/pkg/scripts/testdata/TestKubeadmDebian-with_containerd.golden b/pkg/scripts/testdata/TestKubeadmDebian-with_containerd.golden
index b8aa376fa..04a055668 100644
--- a/pkg/scripts/testdata/TestKubeadmDebian-with_containerd.golden
+++ b/pkg/scripts/testdata/TestKubeadmDebian-with_containerd.golden
@@ -67,17 +67,7 @@ cni_ver="0.8.7*"
 
 
 
-sudo apt-get update
-sudo apt-get install -y apt-transport-https ca-certificates curl software-properties-common lsb-release
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg |
-	sudo apt-key add -
-sudo add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-
-
-sudo apt-mark unhold containerd.io || true
-sudo apt-get install -y containerd.io=1.4.*
-sudo apt-mark hold containerd.io
-
+sudo mkdir -p $(dirname /etc/containerd/config.toml)
 cat <<EOF | sudo tee /etc/containerd/config.toml
 version = 2
 
@@ -96,22 +86,23 @@ SystemdCgroup = true
 [plugins."io.containerd.grpc.v1.cri".registry.mirrors]
 [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"]
 endpoint = ["https://registry-1.docker.io"]
-EOF
 
+EOF
 cat <<EOF | sudo tee /etc/crictl.yaml
 runtime-endpoint: unix:///run/containerd/containerd.sock
 EOF
 
-sudo mkdir -p /etc/systemd/system/containerd.service.d
-cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/environment.conf
-[Service]
-Restart=always
-EnvironmentFile=-/etc/environment
-EOF
 
-sudo systemctl daemon-reload
-sudo systemctl enable --now containerd
-sudo systemctl restart containerd
+sudo apt-get update
+sudo apt-get install -y apt-transport-https ca-certificates curl software-properties-common lsb-release
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg |
+	sudo apt-key add -
+sudo add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+
+
+sudo apt-mark unhold containerd.io || true
+sudo apt-get install -y containerd.io=1.4.*
+sudo apt-mark hold containerd.io
 
 
 
diff --git a/pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden b/pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden
index a4423fe69..0c8870cca 100644
--- a/pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden
+++ b/pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden
@@ -67,17 +67,7 @@ cni_ver="0.8.7*"
 
 
 
-sudo apt-get update
-sudo apt-get install -y apt-transport-https ca-certificates curl software-properties-common lsb-release
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg |
-	sudo apt-key add -
-sudo add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-
-
-sudo apt-mark unhold containerd.io || true
-sudo apt-get install -y containerd.io=1.4.*
-sudo apt-mark hold containerd.io
-
+sudo mkdir -p $(dirname /etc/containerd/config.toml)
 cat <<EOF | sudo tee /etc/containerd/config.toml
 version = 2
 
@@ -98,22 +88,23 @@ SystemdCgroup = true
 endpoint = ["http://127.0.0.1:5000"]
 [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"]
 endpoint = ["https://registry-1.docker.io"]
-EOF
 
+EOF
 cat <<EOF | sudo tee /etc/crictl.yaml
 runtime-endpoint: unix:///run/containerd/containerd.sock
 EOF
 
-sudo mkdir -p /etc/systemd/system/containerd.service.d
-cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/environment.conf
-[Service]
-Restart=always
-EnvironmentFile=-/etc/environment
-EOF
 
-sudo systemctl daemon-reload
-sudo systemctl enable --now containerd
-sudo systemctl restart containerd
+sudo apt-get update
+sudo apt-get install -y apt-transport-https ca-certificates curl software-properties-common lsb-release
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg |
+	sudo apt-key add -
+sudo add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+
+
+sudo apt-mark unhold containerd.io || true
+sudo apt-get install -y containerd.io=1.4.*
+sudo apt-mark hold containerd.io
 
 
 
diff --git a/pkg/scripts/testdata/TestKubeadmFlatcar-force.golden b/pkg/scripts/testdata/TestKubeadmFlatcar-force.golden
index ed616fc8f..0ffcb7cce 100644
--- a/pkg/scripts/testdata/TestKubeadmFlatcar-force.golden
+++ b/pkg/scripts/testdata/TestKubeadmFlatcar-force.golden
@@ -61,7 +61,7 @@ curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOO
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -74,11 +74,17 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
-
 cat <<EOF | sudo tee /etc/crictl.yaml
 runtime-endpoint: unix:///var/run/dockershim.sock
 EOF
 
+sudo mkdir -p /etc/systemd/system/containerd.service.d
+cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/environment.conf
+[Service]
+Restart=always
+EnvironmentFile=-/etc/environment
+EOF
+
 sudo systemctl daemon-reload
 sudo systemctl enable --now docker
 sudo systemctl restart docker
diff --git a/pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry.golden b/pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry.golden
index ed616fc8f..0ffcb7cce 100644
--- a/pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry.golden
+++ b/pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry.golden
@@ -61,7 +61,7 @@ curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOO
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -74,11 +74,17 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
-
 cat <<EOF | sudo tee /etc/crictl.yaml
 runtime-endpoint: unix:///var/run/dockershim.sock
 EOF
 
+sudo mkdir -p /etc/systemd/system/containerd.service.d
+cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/environment.conf
+[Service]
+Restart=always
+EnvironmentFile=-/etc/environment
+EOF
+
 sudo systemctl daemon-reload
 sudo systemctl enable --now docker
 sudo systemctl restart docker
diff --git a/pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry_insecure.golden b/pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry_insecure.golden
index f9a9b830d..5aaae6c07 100644
--- a/pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry_insecure.golden
+++ b/pkg/scripts/testdata/TestKubeadmFlatcar-overwrite_registry_insecure.golden
@@ -61,7 +61,7 @@ curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOO
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -77,11 +77,17 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	]
 }
 EOF
-
 cat <<EOF | sudo tee /etc/crictl.yaml
 runtime-endpoint: unix:///var/run/dockershim.sock
 EOF
 
+sudo mkdir -p /etc/systemd/system/containerd.service.d
+cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/environment.conf
+[Service]
+Restart=always
+EnvironmentFile=-/etc/environment
+EOF
+
 sudo systemctl daemon-reload
 sudo systemctl enable --now docker
 sudo systemctl restart docker
diff --git a/pkg/scripts/testdata/TestKubeadmFlatcar-simple.golden b/pkg/scripts/testdata/TestKubeadmFlatcar-simple.golden
index ed616fc8f..0ffcb7cce 100644
--- a/pkg/scripts/testdata/TestKubeadmFlatcar-simple.golden
+++ b/pkg/scripts/testdata/TestKubeadmFlatcar-simple.golden
@@ -61,7 +61,7 @@ curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOO
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -74,11 +74,17 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
-
 cat <<EOF | sudo tee /etc/crictl.yaml
 runtime-endpoint: unix:///var/run/dockershim.sock
 EOF
 
+sudo mkdir -p /etc/systemd/system/containerd.service.d
+cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/environment.conf
+[Service]
+Restart=always
+EnvironmentFile=-/etc/environment
+EOF
+
 sudo systemctl daemon-reload
 sudo systemctl enable --now docker
 sudo systemctl restart docker
diff --git a/pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd.golden b/pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd.golden
index afa57e14d..837da0cdd 100644
--- a/pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd.golden
+++ b/pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd.golden
@@ -62,6 +62,28 @@ curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOO
 
 
 
+
+sudo mkdir -p $(dirname /etc/containerd/config.toml)
+cat <<EOF | sudo tee /etc/containerd/config.toml
+version = 2
+
+[metrics]
+address = "127.0.0.1:1338"
+
+[plugins]
+[plugins."io.containerd.grpc.v1.cri"]
+[plugins."io.containerd.grpc.v1.cri".containerd]
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
+runtime_type = "io.containerd.runc.v2"
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+SystemdCgroup = true
+[plugins."io.containerd.grpc.v1.cri".registry]
+[plugins."io.containerd.grpc.v1.cri".registry.mirrors]
+[plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"]
+endpoint = ["https://registry-1.docker.io"]
+
+EOF
 cat <<EOF | sudo tee /etc/crictl.yaml
 runtime-endpoint: unix:///run/containerd/containerd.sock
 EOF
@@ -73,6 +95,15 @@ Restart=always
 EnvironmentFile=-/etc/environment
 EOF
 
+
+cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/10-kubeone.conf
+[Service]
+Restart=always
+Environment=CONTAINERD_CONFIG=/etc/containerd/config.toml
+ExecStart=
+ExecStart=/usr/bin/env PATH=${TORCX_BINDIR}:${PATH} ${TORCX_BINDIR}/containerd --config ${CONTAINERD_CONFIG}
+EOF
+
 sudo systemctl daemon-reload
 sudo systemctl enable --now containerd
 sudo systemctl restart containerd
diff --git a/pkg/scripts/testdata/TestMigrateToContainerd-flatcat.golden b/pkg/scripts/testdata/TestMigrateToContainerd-flatcat.golden
index 35073299b..e60ad3bcb 100644
--- a/pkg/scripts/testdata/TestMigrateToContainerd-flatcat.golden
+++ b/pkg/scripts/testdata/TestMigrateToContainerd-flatcat.golden
@@ -4,4 +4,49 @@ sudo systemctl stop kubelet
 sudo docker ps -q | xargs sudo docker stop || true
 sudo docker ps -qa | xargs sudo docker rm || true
 
+
+sudo mkdir -p $(dirname /etc/containerd/config.toml)
+cat <<EOF | sudo tee /etc/containerd/config.toml
+version = 2
+
+[metrics]
+address = "127.0.0.1:1338"
+
+[plugins]
+[plugins."io.containerd.grpc.v1.cri"]
+[plugins."io.containerd.grpc.v1.cri".containerd]
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
+runtime_type = "io.containerd.runc.v2"
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
+SystemdCgroup = true
+[plugins."io.containerd.grpc.v1.cri".registry]
+[plugins."io.containerd.grpc.v1.cri".registry.mirrors]
+[plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"]
+endpoint = ["https://registry-1.docker.io"]
+
+EOF
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///run/containerd/containerd.sock
+EOF
+
+sudo mkdir -p /etc/systemd/system/containerd.service.d
+cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/environment.conf
+[Service]
+Restart=always
+EnvironmentFile=-/etc/environment
+EOF
+
+
+cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/10-kubeone.conf
+[Service]
+Restart=always
+Environment=CONTAINERD_CONFIG=/etc/containerd/config.toml
+ExecStart=
+ExecStart=/usr/bin/env PATH=${TORCX_BINDIR}:${PATH} ${TORCX_BINDIR}/containerd --config ${CONTAINERD_CONFIG}
+EOF
+
+sudo systemctl daemon-reload
+sudo systemctl enable --now containerd
+sudo systemctl restart containerd
 sudo systemctl restart kubelet
diff --git a/pkg/scripts/testdata/TestMigrateToContainerd-insecureRegistry.golden b/pkg/scripts/testdata/TestMigrateToContainerd-insecureRegistry.golden
index 1c2a2ad54..9c90e605b 100644
--- a/pkg/scripts/testdata/TestMigrateToContainerd-insecureRegistry.golden
+++ b/pkg/scripts/testdata/TestMigrateToContainerd-insecureRegistry.golden
@@ -4,6 +4,8 @@ sudo systemctl stop kubelet
 sudo docker ps -q | xargs sudo docker stop || true
 sudo docker ps -qa | xargs sudo docker rm || true
 
+
+sudo mkdir -p $(dirname /etc/containerd/config.toml)
 cat <<EOF | sudo tee /etc/containerd/config.toml
 version = 2
 
@@ -24,8 +26,8 @@ SystemdCgroup = true
 endpoint = ["https://registry-1.docker.io"]
 [plugins."io.containerd.grpc.v1.cri".registry.mirrors."some.registry"]
 endpoint = ["http://some.registry"]
-EOF
 
+EOF
 cat <<EOF | sudo tee /etc/crictl.yaml
 runtime-endpoint: unix:///run/containerd/containerd.sock
 EOF
@@ -37,6 +39,15 @@ Restart=always
 EnvironmentFile=-/etc/environment
 EOF
 
+
+cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/10-kubeone.conf
+[Service]
+Restart=always
+Environment=CONTAINERD_CONFIG=/etc/containerd/config.toml
+ExecStart=
+ExecStart=/usr/bin/env PATH=${TORCX_BINDIR}:${PATH} ${TORCX_BINDIR}/containerd --config ${CONTAINERD_CONFIG}
+EOF
+
 sudo systemctl daemon-reload
 sudo systemctl enable --now containerd
 sudo systemctl restart containerd
diff --git a/pkg/scripts/testdata/TestMigrateToContainerd-simple.golden b/pkg/scripts/testdata/TestMigrateToContainerd-simple.golden
index 18f5eec7e..e60ad3bcb 100644
--- a/pkg/scripts/testdata/TestMigrateToContainerd-simple.golden
+++ b/pkg/scripts/testdata/TestMigrateToContainerd-simple.golden
@@ -4,6 +4,8 @@ sudo systemctl stop kubelet
 sudo docker ps -q | xargs sudo docker stop || true
 sudo docker ps -qa | xargs sudo docker rm || true
 
+
+sudo mkdir -p $(dirname /etc/containerd/config.toml)
 cat <<EOF | sudo tee /etc/containerd/config.toml
 version = 2
 
@@ -22,8 +24,8 @@ SystemdCgroup = true
 [plugins."io.containerd.grpc.v1.cri".registry.mirrors]
 [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"]
 endpoint = ["https://registry-1.docker.io"]
-EOF
 
+EOF
 cat <<EOF | sudo tee /etc/crictl.yaml
 runtime-endpoint: unix:///run/containerd/containerd.sock
 EOF
@@ -35,6 +37,15 @@ Restart=always
 EnvironmentFile=-/etc/environment
 EOF
 
+
+cat <<EOF | sudo tee /etc/systemd/system/containerd.service.d/10-kubeone.conf
+[Service]
+Restart=always
+Environment=CONTAINERD_CONFIG=/etc/containerd/config.toml
+ExecStart=
+ExecStart=/usr/bin/env PATH=${TORCX_BINDIR}:${PATH} ${TORCX_BINDIR}/containerd --config ${CONTAINERD_CONFIG}
+EOF
+
 sudo systemctl daemon-reload
 sudo systemctl enable --now containerd
 sudo systemctl restart containerd
diff --git a/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIAmazonLinux.golden b/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIAmazonLinux.golden
index 8092ac40f..9d6a0efa9 100644
--- a/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIAmazonLinux.golden
+++ b/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIAmazonLinux.golden
@@ -71,7 +71,7 @@ sudo yum install -y \
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -84,6 +84,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo yum versionlock delete docker cri-tools containerd || true
 
@@ -92,11 +95,6 @@ sudo yum install -y \
 	containerd.io-1.4.* \
 	cri-tools-1.13.0
 sudo yum versionlock add docker cri-tools containerd
-
-cat <<EOF | sudo tee /etc/crictl.yaml
-runtime-endpoint: unix:///var/run/dockershim.sock
-EOF
-
 sudo systemctl daemon-reload
 sudo systemctl enable --now containerd
 sudo systemctl enable --now docker
diff --git a/pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden b/pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden
index bd49a9a48..c0704ba48 100644
--- a/pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden
+++ b/pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden
@@ -71,7 +71,7 @@ sudo yum install -y \
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -84,7 +84,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
-
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo yum install -y yum-utils
 sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
diff --git a/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIDebian.golden b/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIDebian.golden
index 5ee75a22f..0d73ed80c 100644
--- a/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIDebian.golden
+++ b/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIDebian.golden
@@ -66,7 +66,7 @@ sudo apt-mark unhold kubelet kubeadm kubectl kubernetes-cni
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -79,6 +79,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
diff --git a/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlAmazonLinux.golden b/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlAmazonLinux.golden
index ca964a751..cb51b7746 100644
--- a/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlAmazonLinux.golden
+++ b/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlAmazonLinux.golden
@@ -71,7 +71,7 @@ sudo yum install -y \
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -84,6 +84,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo yum versionlock delete docker cri-tools containerd || true
 
@@ -92,11 +95,6 @@ sudo yum install -y \
 	containerd.io-1.4.* \
 	cri-tools-1.13.0
 sudo yum versionlock add docker cri-tools containerd
-
-cat <<EOF | sudo tee /etc/crictl.yaml
-runtime-endpoint: unix:///var/run/dockershim.sock
-EOF
-
 sudo systemctl daemon-reload
 sudo systemctl enable --now containerd
 sudo systemctl enable --now docker
diff --git a/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlCentOS.golden b/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlCentOS.golden
index affd744ad..a70de60e2 100644
--- a/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlCentOS.golden
+++ b/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlCentOS.golden
@@ -71,7 +71,7 @@ sudo yum install -y \
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -84,7 +84,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
-
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 sudo yum install -y yum-utils
 sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
diff --git a/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlDebian.golden b/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlDebian.golden
index 437de2809..da3bee718 100644
--- a/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlDebian.golden
+++ b/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlDebian.golden
@@ -66,7 +66,7 @@ sudo apt-mark unhold kubelet kubeadm kubectl kubernetes-cni
 
 
 
-sudo mkdir -p /etc/docker
+sudo mkdir -p $(dirname /etc/docker/daemon.json)
 cat <<EOF | sudo tee /etc/docker/daemon.json
 {
 	"exec-opts": [
@@ -79,6 +79,9 @@ cat <<EOF | sudo tee /etc/docker/daemon.json
 	}
 }
 EOF
+cat <<EOF | sudo tee /etc/crictl.yaml
+runtime-endpoint: unix:///var/run/dockershim.sock
+EOF
 
 
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -