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 28, 2023 · 84f7fc8 · 84f7fc8
1 parent 76e369a
commit 84f7fc8
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
@@ -73,6 +73,8 @@ spec:
                   # kubeadm must run after coreos-metadata populated /run/metadata directory.
                   Requires=coreos-metadata.service
                   After=coreos-metadata.service
+                  # kubeadm must run after containerd - see https://github.com/kubernetes-sigs/image-builder/issues/939.
+                  After=containerd.service
                   [Service]
                   # To make metadata environment variables available for pre-kubeadm commands.
                   EnvironmentFile=/run/metadata/*
@@ -155,6 +157,8 @@ spec:
                     # kubeadm must run after coreos-metadata populated /run/metadata directory.
                     Requires=coreos-metadata.service
                     After=coreos-metadata.service
+                    # kubeadm must run after containerd - see https://github.com/kubernetes-sigs/image-builder/issues/939.
+                    After=containerd.service
                     [Service]
                     # To make metadata environment variables available for pre-kubeadm commands.
                     EnvironmentFile=/run/metadata/*

diff --git a/.../infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-ignition.yaml b/.../infrastructure-aws/withoutclusterclass/e2e_test_templates/cluster-template-ignition.yaml
@@ -61,6 +61,8 @@ spec:
                   # kubeadm must run after coreos-metadata populated /run/metadata directory.
                   Requires=coreos-metadata.service
                   After=coreos-metadata.service
+                  # kubeadm must run after containerd - see https://github.com/kubernetes-sigs/image-builder/issues/939.
+                  After=containerd.service
                   [Service]
                   # To make metadata environment variables available for pre-kubeadm commands.
                   EnvironmentFile=/run/metadata/*
@@ -154,6 +156,8 @@ spec:
                     # kubeadm must run after coreos-metadata populated /run/metadata directory.
                     Requires=coreos-metadata.service
                     After=coreos-metadata.service
+                    # kubeadm must run after containerd - see https://github.com/kubernetes-sigs/image-builder/issues/939.
+                    After=containerd.service
                     [Service]
                     # To make metadata environment variables available for pre-kubeadm commands.
                     EnvironmentFile=/run/metadata/*

diff --git a/...re-aws/withoutclusterclass/kustomize_sources/ignition/patches/control-plane-ignition.yaml b/...re-aws/withoutclusterclass/kustomize_sources/ignition/patches/control-plane-ignition.yaml
@@ -29,6 +29,8 @@ spec:
                   # kubeadm must run after coreos-metadata populated /run/metadata directory.
                   Requires=coreos-metadata.service
                   After=coreos-metadata.service
+                  # kubeadm must run after containerd - see https://github.com/kubernetes-sigs/image-builder/issues/939.
+                  After=containerd.service
                   [Service]
                   # To make metadata environment variables available for pre-kubeadm commands.
                   EnvironmentFile=/run/metadata/*

diff --git a/...structure-aws/withoutclusterclass/kustomize_sources/ignition/patches/worker-ignition.yaml b/...structure-aws/withoutclusterclass/kustomize_sources/ignition/patches/worker-ignition.yaml
@@ -25,6 +25,8 @@ spec:
                     # kubeadm must run after coreos-metadata populated /run/metadata directory.
                     Requires=coreos-metadata.service
                     After=coreos-metadata.service
+                    # kubeadm must run after containerd - see https://github.com/kubernetes-sigs/image-builder/issues/939.
+                    After=containerd.service
                     [Service]
                     # To make metadata environment variables available for pre-kubeadm commands.
                     EnvironmentFile=/run/metadata/*