Update GCE cluster bootstrapping and e2e test

Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-05 19:14:33 +00:00
parent 05bcc3e88c
commit 936dcceb5a
10 changed files with 143 additions and 219 deletions
--- a/test/build.sh
+++ b/test/build.sh
@@ -55,4 +55,4 @@ make clean
 DEPLOY_DIR=${DEPLOY_DIR:-""} make push
 # Build and push node e2e tarball.
 PUSH_VERSION=true DEPLOY_DIR=${DEPLOY_DIR:-""} \
-  make push TARBALL_PREFIX=cri-containerd-cni INCLUDE_CNI=true
+  make push TARBALL_PREFIX=cri-containerd-cni INCLUDE_CNI=true CUSTOM_CONTAINERD=true
--- a/test/configure.sh
+++ b/test/configure.sh
@@ -19,9 +19,9 @@ set -o errexit
 set -o nounset
 set -o pipefail

-# CRI_CONTAINERD_HOME is the directory for cri-containerd.
-CRI_CONTAINERD_HOME="/home/cri-containerd"
-cd "${CRI_CONTAINERD_HOME}"
+# CONTAINERD_HOME is the directory for containerd.
+CONTAINERD_HOME="/home/containerd"
+cd "${CONTAINERD_HOME}"

 # fetch_metadata fetches metadata from GCE metadata server.
 # Var set:
@@ -72,11 +72,11 @@ curl -f --ipv4 -Lo "${TARBALL}" --connect-timeout 20 --max-time 300 --retry 6 --
 tar xvf "${TARBALL}"

 # Copy crictl config.
-cp "${CRI_CONTAINERD_HOME}/etc/crictl.yaml" /etc
+cp "${CONTAINERD_HOME}/etc/crictl.yaml" /etc

 # TODO(random-liu): Stop docker on the node, this may break docker.
-echo "export PATH=${CRI_CONTAINERD_HOME}/usr/local/bin/:${CRI_CONTAINERD_HOME}/usr/local/sbin/:\$PATH" > \
-  /etc/profile.d/cri-containerd_env.sh
+echo "export PATH=${CONTAINERD_HOME}/usr/local/bin/:${CONTAINERD_HOME}/usr/local/sbin/:\$PATH" > \
+  /etc/profile.d/containerd_env.sh

 # EXTRA_INIT_SCRIPT is the name of the extra init script after being downloaded.
 EXTRA_INIT_SCRIPT="extra-init.sh"
--- a/test/e2e_node/benchmark-config.yaml
+++ b/test/e2e_node/benchmark-config.yaml
@@ -4,21 +4,21 @@ images:
    image: cos-stable-60-9592-90-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'resource tracking for 0 pods per node \[Benchmark\]'
  cosstable2-resource2:
    image: cos-stable-60-9592-90-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'resource tracking for 35 pods per node \[Benchmark\]'
  cosstable2-resource3:
    image: cos-stable-60-9592-90-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'resource tracking for 105 pods per node \[Benchmark\]'

@@ -26,35 +26,35 @@ images:
    image: cos-stable-60-9592-90-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'create 35 pods with 0s? interval \[Benchmark\]'
  cosstable2-density2:
    image: cos-stable-60-9592-90-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'create 105 pods with 0s? interval \[Benchmark\]'
  cosstable2-density2-qps60:
    image: cos-stable-60-9592-90-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'create 105 pods with 0s? interval \(QPS 60\) \[Benchmark\]'
  cosstable2-density3:
    image: cos-stable-60-9592-90-0
    project: cos-cloud
    machine: n1-standard-2
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'create 105 pods with 0s? interval \[Benchmark\]'
  cosstable2-density4:
    image: cos-stable-60-9592-90-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'create 105 pods with 100ms interval \[Benchmark\]'

@@ -62,42 +62,42 @@ images:
    image: cos-stable-63-10032-71-0 
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'resource tracking for 0 pods per node \[Benchmark\]'
  cosstable1-resource2:
    image: cos-stable-63-10032-71-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'resource tracking for 35 pods per node \[Benchmark\]'
  cosstable1-resource3:
    image: cos-stable-63-10032-71-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'resource tracking for 105 pods per node \[Benchmark\]'
  cosbeta-resource1:
    image: cos-beta-63-10032-71-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'resource tracking for 0 pods per node \[Benchmark\]'
  cosbeta-resource2:
    image: cos-beta-63-10032-71-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'resource tracking for 35 pods per node \[Benchmark\]'
  cosbeta-resource3:
    image: cos-beta-63-10032-71-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'resource tracking for 105 pods per node \[Benchmark\]'

@@ -105,35 +105,35 @@ images:
    image: cos-beta-63-10032-71-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'create 35 pods with 0s? interval \[Benchmark\]'
  cosbeta-density2:
    image: cos-beta-63-10032-71-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'create 105 pods with 0s? interval \[Benchmark\]'
  cosbeta-density2-qps60:
    image: cos-beta-63-10032-71-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'create 105 pods with 0s? interval \(QPS 60\) \[Benchmark\]'
  cosbeta-density3:
    image: cos-beta-63-10032-71-0
    project: cos-cloud
    machine: n1-standard-2
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'create 105 pods with 0s? interval \[Benchmark\]'
  cosbeta-density4:
    image: cos-beta-63-10032-71-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'create 105 pods with 100ms interval \[Benchmark\]'

@@ -141,21 +141,21 @@ images:
    image: cos-dev-64-10112-0-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'resource tracking for 0 pods per node \[Benchmark\]'
  cosdev-resource2:
    image: cos-dev-64-10112-0-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'resource tracking for 35 pods per node \[Benchmark\]'
  cosdev-resource3:
    image: cos-dev-64-10112-0-0
    project: cos-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
    tests:
      - 'resource tracking for 105 pods per node \[Benchmark\]'

@@ -163,21 +163,21 @@ images:
    image: ubuntu-gke-1604-xenial-v20170816-1
    project: ubuntu-os-gke-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh"
    tests:
      - 'resource tracking for 0 pods per node \[Benchmark\]'
  ubuntustable2-resource2:
    image: ubuntu-gke-1604-xenial-v20170816-1
    project: ubuntu-os-gke-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh"
    tests:
      - 'resource tracking for 35 pods per node \[Benchmark\]'
  ubuntustable2-resource3:
    image: ubuntu-gke-1604-xenial-v20170816-1
    project: ubuntu-os-gke-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh"
    tests:
      - 'resource tracking for 105 pods per node \[Benchmark\]'

@@ -185,20 +185,20 @@ images:
    image: ubuntu-gke-1604-xenial-v20171108-1
    project: ubuntu-os-gke-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh"
    tests:
      - 'resource tracking for 0 pods per node \[Benchmark\]'
  ubuntustable1-resource2:
    image: ubuntu-gke-1604-xenial-v20171108-1
    project: ubuntu-os-gke-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh"
    tests:
      - 'resource tracking for 35 pods per node \[Benchmark\]'
  ubuntustable1-resource3:
    image: ubuntu-gke-1604-xenial-v20171108-1
    project: ubuntu-os-gke-cloud
    machine: n1-standard-1
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh"
    tests:
      - 'resource tracking for 105 pods per node \[Benchmark\]'
--- a/test/e2e_node/image-config.yaml
+++ b/test/e2e_node/image-config.yaml
@@ -2,8 +2,8 @@ images:
  ubuntu:
    image: ubuntu-gke-1604-xenial-v20170420-1
    project: ubuntu-os-gke-cloud
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh"
  cos-stable:
    image_regex: cos-stable-60-9592-84-0
    project: cos-cloud
-    metadata: "user-data<test/e2e_node/init.yaml,cri-containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
+    metadata: "user-data<test/e2e_node/init.yaml,containerd-configure-sh<test/configure.sh,extra-init-sh<test/e2e_node/gci-init.sh,gci-update-strategy=update_disabled"
--- a/test/e2e_node/init.yaml
+++ b/test/e2e_node/init.yaml
@@ -1,27 +1,27 @@
 #cloud-config

 write_files:
-  - path: /etc/systemd/system/cri-containerd-installation.service
+  - path: /etc/systemd/system/containerd-installation.service
    permissions: 0644
    owner: root
    content: |
      # installed by cloud-init
      [Unit]
-      Description=Download and install cri-containerd binaries and configurations.
+      Description=Download and install containerd binaries and configurations.
      After=network-online.target

      [Service]
      Type=oneshot
      RemainAfterExit=yes
-      ExecStartPre=/bin/mkdir -p /home/cri-containerd
-      ExecStartPre=/bin/mount --bind /home/cri-containerd /home/cri-containerd
-      ExecStartPre=/bin/mount -o remount,exec /home/cri-containerd
-      ExecStartPre=/usr/bin/curl --fail --retry 5 --retry-delay 3 --silent --show-error -H "X-Google-Metadata-Request: True" -o /home/cri-containerd/configure.sh http://metadata.google.internal/computeMetadata/v1/instance/attributes/cri-containerd-configure-sh
-      ExecStartPre=/bin/chmod 544 /home/cri-containerd/configure.sh
-      ExecStart=/home/cri-containerd/configure.sh
+      ExecStartPre=/bin/mkdir -p /home/containerd
+      ExecStartPre=/bin/mount --bind /home/containerd /home/containerd
+      ExecStartPre=/bin/mount -o remount,exec /home/containerd
+      ExecStartPre=/usr/bin/curl --fail --retry 5 --retry-delay 3 --silent --show-error -H "X-Google-Metadata-Request: True" -o /home/containerd/configure.sh http://metadata.google.internal/computeMetadata/v1/instance/attributes/containerd-configure-sh
+      ExecStartPre=/bin/chmod 544 /home/containerd/configure.sh
+      ExecStart=/home/containerd/configure.sh

      [Install]
-      WantedBy=cri-containerd.target
+      WantedBy=containerd.target

  - path: /etc/containerd/config.toml
    permissions: 0644
@@ -34,8 +34,14 @@ write_files:
        path = "/runtime"

      [plugins.linux]
-        shim = "/home/cri-containerd/usr/local/bin/containerd-shim"
-        runtime = "/home/cri-containerd/usr/local/sbin/runc"
+        shim = "/home/containerd/usr/local/bin/containerd-shim"
+        runtime = "/home/containerd/usr/local/sbin/runc"
+
+      [plugins.cri.cni]
+        bin_dir = "/home/containerd/opt/cni/bin"
+        conf_dir = "/home/containerd/etc/cni/net.d"
+      [plugins.cri.registry.mirrors."docker.io"]
+        endpoint = ["https://mirror.gcr.io","https://registry-1.docker.io"]

  - path: /etc/systemd/system/containerd.service
    permissions: 0644
@@ -45,7 +51,7 @@ write_files:
      [Unit]
      Description=containerd container runtime
      Documentation=https://containerd.io
-      After=cri-containerd-installation.service
+      After=containerd-installation.service

      [Service]
      Restart=always
@@ -58,53 +64,24 @@ write_files:
      LimitNPROC=infinity
      LimitCORE=infinity
      ExecStartPre=/sbin/modprobe overlay
-      ExecStart=/home/cri-containerd/usr/local/bin/containerd --log-level debug
+      ExecStart=/home/containerd/usr/local/bin/containerd --log-level debug

      [Install]
-      WantedBy=cri-containerd.target
+      WantedBy=containerd.target

-  - path: /etc/systemd/system/cri-containerd.service
-    permissions: 0644
-    owner: root
-    content: |
-      # installed by cloud-init
-      [Unit]
-      Description=Kubernetes containerd CRI shim
-      Requires=network-online.target
-      After=cri-containerd-installation.service
-
-      [Service]
-      Restart=always
-      RestartSec=5
-      LimitNOFILE=1048576
-      # Having non-zero Limit*s causes performance problems due to accounting overhead
-      # in the kernel. We recommend using cgroups to do container-local accounting.
-      LimitNPROC=infinity
-      LimitCORE=infinity
-      ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \
-        --log-level=debug \
-        --network-bin-dir=/home/cri-containerd/opt/cni/bin \
-        --network-conf-dir=/home/cri-containerd/etc/cni/net.d \
-        --cgroup-path=/runtime \
-        --registry=docker.io=https://mirror.gcr.io,https://registry-1.docker.io
-
-      [Install]
-      WantedBy=cri-containerd.target
-
-  - path: /etc/systemd/system/cri-containerd.target
+  - path: /etc/systemd/system/containerd.target
    permissions: 0644
    owner: root
    content: |
      [Unit]
-      Description=CRI Containerd
+      Description=Containerd

      [Install]
      WantedBy=multi-user.target

 runcmd:
  - systemctl daemon-reload
+  - systemctl enable containerd-installation.service
  - systemctl enable containerd.service
-  - systemctl enable cri-containerd-installation.service
-  - systemctl enable cri-containerd.service
-  - systemctl enable cri-containerd.target
-  - systemctl start cri-containerd.target
+  - systemctl enable containerd.target
+  - systemctl start containerd.target