Fix environment sourcing when containerd is chosen (#928)

Signed-off-by: Artiom Diomin <[email protected]>

Author: kron4eg

pkg/containerruntime/containerd.go

@@ -83,8 +83,6 @@ yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce
     More info at: https://bugzilla.redhat.com/show_bug.cgi?id=1756473
 */}}
 yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
-yum install -y containerd.io-{{ .ContainerdVersion }} yum-plugin-versionlock
-yum versionlock add containerd.io
 
 cat <<EOF | tee /etc/crictl.yaml
 runtime-endpoint: unix:///run/containerd/containerd.sock
@@ -97,6 +95,9 @@ Restart=always
 EnvironmentFile=-/etc/environment
 EOF
 
+yum install -y containerd.io-{{ .ContainerdVersion }} yum-plugin-versionlock
+yum versionlock add containerd.io
+
 systemctl daemon-reload
 systemctl enable --now containerd
 `))
@@ -106,7 +107,6 @@ apt-get update
 apt-get install -y apt-transport-https ca-certificates curl software-properties-common lsb-release
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
 add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-apt-get install -y containerd.io={{ .ContainerdVersion }}*
 
 cat <<EOF | tee /etc/crictl.yaml
 runtime-endpoint: unix:///run/containerd/containerd.sock
@@ -119,6 +119,9 @@ Restart=always
 EnvironmentFile=-/etc/environment
 EOF
 
+apt-get install -y containerd.io={{ .ContainerdVersion }}*
+apt-mark hold containerd.io
+
 systemctl daemon-reload
 systemctl enable --now containerd
 `))

pkg/userdata/ubuntu/testdata/containerd.yaml

@@ -93,7 +93,6 @@ write_files:
     apt-get install -y apt-transport-https ca-certificates curl software-properties-common lsb-release
     curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
     add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-    apt-get install -y containerd.io=1.4.3*
 
     cat <<EOF | tee /etc/crictl.yaml
     runtime-endpoint: unix:///run/containerd/containerd.sock
@@ -106,6 +105,9 @@ write_files:
     EnvironmentFile=-/etc/environment
     EOF
 
+    apt-get install -y containerd.io=1.4.3*
+    apt-mark hold containerd.io
+
     systemctl daemon-reload
     systemctl enable --now containerd