flatcar: Run kubeadm after containerd

Ensure kubeadm runs after containerd to avoid a race condition between the two. We intentionally add an After= directive and not a Requires= directive to avoid breaking things for distros which use Ignition and don't use containerd. See kubernetes-sigs/image-builder#939. Signed-off-by: Johanan Liebermann <[email protected]>
kubernetes-sigs · Sep 29, 2023 · b4fc8ba · b4fc8ba
1 parent 1862e18
commit b4fc8ba
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/templates/cluster-template-flatcar.yaml b/templates/cluster-template-flatcar.yaml
diff --git a/templates/flavors/flatcar/machine-deployment.yaml b/templates/flavors/flatcar/machine-deployment.yaml
@@ -67,6 +67,8 @@ spec:
                   contents: |
                     [Unit]
                     After=oem-cloudinit.service
+                    # kubeadm must run after containerd - see https://github.com/kubernetes-sigs/image-builder/issues/939.
+                    After=containerd.service
       joinConfiguration:
         nodeRegistration:
           kubeletExtraArgs:

diff --git a/templates/flavors/flatcar/patches/kubeadm-controlplane.yaml b/templates/flavors/flatcar/patches/kubeadm-controlplane.yaml
@@ -28,6 +28,8 @@ spec:
                 contents: |
                   [Unit]
                   After=oem-cloudinit.service
+                  # kubeadm must run after containerd - see https://github.com/kubernetes-sigs/image-builder/issues/939.
+                  After=containerd.service
           # Workaround for https://github.com/kubernetes-sigs/cluster-api/issues/7679.
           storage:
             disks:

diff --git a/templates/test/ci/cluster-template-prow-flatcar.yaml b/templates/test/ci/cluster-template-prow-flatcar.yaml