Merge pull request #6553 from bobbypage/backport-6544-1-4

[release/1.4] backport: Wait for containerd installation in GCE scripts
containerd · Feb 16, 2022 · 7aa560b · 7aa560b
2 parents b5811c7 + 6d93874
commit 7aa560b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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