From 5f33a519678cf685432e378f2260283f070576c2 Mon Sep 17 00:00:00 2001 From: David Porter Date: Thu, 10 Feb 2022 14:55:11 -0800 Subject: [PATCH] Wait for containerd installation in GCE scripts Prior to running the `kube-node-installation.service`, the containerd installation should be complete as the k8s installation may have dependencies on containerd and related binaries (e.g ctr). Add wants/after systemd directives to ensure `kube-node-installation.service` will only start after containerd installation completes. Signed-off-by: David Porter --- contrib/gce/cloud-init/master.yaml | 3 ++- contrib/gce/cloud-init/node.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/gce/cloud-init/master.yaml b/contrib/gce/cloud-init/master.yaml index 35c869c5b84b2..1b2aea445e5dc 100644 --- a/contrib/gce/cloud-init/master.yaml +++ b/contrib/gce/cloud-init/master.yaml @@ -75,7 +75,8 @@ write_files: content: | [Unit] Description=Download and install k8s binaries and configurations - After=network-online.target + After=network-online.target containerd.target + Wants=network-online.target containerd.target [Service] Type=oneshot diff --git a/contrib/gce/cloud-init/node.yaml b/contrib/gce/cloud-init/node.yaml index 97d7ad4295438..56dae241966ee 100644 --- a/contrib/gce/cloud-init/node.yaml +++ b/contrib/gce/cloud-init/node.yaml @@ -69,7 +69,8 @@ write_files: content: | [Unit] Description=Download and install k8s binaries and configurations - After=network-online.target + After=network-online.target containerd.target + Wants=network-online.target containerd.target [Service] Type=oneshot