Merge pull request #4054 from k8s-infra-cherrypick-robot/cherry-pick-…

…4049-to-release-1.10 [release-1.10] flatcar: Run kubeadm after containerd
kubernetes-sigs · Sep 29, 2023 · a598817 · a598817
2 parents 1862e18 + b4fc8ba
commit a598817
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