diff --git a/nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml b/nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml index a8530ec10c..14ad8293bf 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/flatcar/tasks.yaml @@ -40,16 +40,16 @@ contents: | [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] SystemdCgroup = true -path: /etc/containerd/config-kops.toml +path: /etc/containerd/config.toml type: file --- afterFiles: -- /etc/containerd/config-kops.toml +- /etc/containerd/config.toml contents: |- [Service] EnvironmentFile=/etc/environment ExecStart= - ExecStart=/usr/bin/containerd --config /etc/containerd/config-kops.toml + ExecStart=/usr/bin/containerd --config /etc/containerd/config.toml onChangeExecute: - - systemctl - daemon-reload diff --git a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/tasks.yaml b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/tasks.yaml index 0acc0311bd..ea4361c302 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/tasks.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.11/tasks.yaml @@ -1,6 +1,6 @@ contents: | disabled_plugins = ["cri"] -path: /etc/containerd/config-kops.toml +path: /etc/containerd/config.toml type: file --- contents: CONTAINERD_OPTS=--log-level=info @@ -214,7 +214,7 @@ definition: | EnvironmentFile=/etc/sysconfig/containerd EnvironmentFile=/etc/environment ExecStartPre=-/sbin/modprobe overlay - ExecStart=/usr/bin/containerd -c /etc/containerd/config-kops.toml "$CONTAINERD_OPTS" + ExecStart=/usr/bin/containerd -c /etc/containerd/config.toml "$CONTAINERD_OPTS" Delegate=yes KillMode=process Restart=always diff --git a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/tasks.yaml b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/tasks.yaml index d30fcdc0ff..638da7cb5b 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/tasks.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/from_docker_19.03.14/tasks.yaml @@ -1,6 +1,6 @@ contents: | disabled_plugins = ["cri"] -path: /etc/containerd/config-kops.toml +path: /etc/containerd/config.toml type: file --- contents: CONTAINERD_OPTS=--log-level=info @@ -214,7 +214,7 @@ definition: | EnvironmentFile=/etc/sysconfig/containerd EnvironmentFile=/etc/environment ExecStartPre=-/sbin/modprobe overlay - ExecStart=/usr/bin/containerd -c /etc/containerd/config-kops.toml "$CONTAINERD_OPTS" + ExecStart=/usr/bin/containerd -c /etc/containerd/config.toml "$CONTAINERD_OPTS" Type=notify Delegate=yes KillMode=process diff --git a/nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml b/nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml index d0b5084a91..ef5335c686 100644 --- a/nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml +++ b/nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml @@ -40,7 +40,7 @@ contents: | [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] SystemdCgroup = true -path: /etc/containerd/config-kops.toml +path: /etc/containerd/config.toml type: file --- contents: |2 @@ -347,7 +347,7 @@ definition: | EnvironmentFile=/etc/sysconfig/containerd EnvironmentFile=/etc/environment ExecStartPre=-/sbin/modprobe overlay - ExecStart=/usr/bin/containerd -c /etc/containerd/config-kops.toml "$CONTAINERD_OPTS" + ExecStart=/usr/bin/containerd -c /etc/containerd/config.toml "$CONTAINERD_OPTS" Type=notify Delegate=yes KillMode=process