From 65352fef396a4ddd319682e74acb3bb208ba8ff7 Mon Sep 17 00:00:00 2001
From: Yang-Ming Lin <11317013+yangminglintw@users.noreply.github.com>
Date: Fri, 3 Apr 2026 22:47:03 +0800
Subject: [PATCH] Fix Flatcar flaky CI by enabling apiserver wait after DNS
 handler (#13063)

Remove the Flatcar/Fedora CoreOS exclusion from the wait handler
and unify the Flatcar-specific notify channel into the shared
"propagate resolvconf to k8s components" channel.
---
 roles/kubernetes/preinstall/handlers/main.yml         | 4 +---
 roles/kubernetes/preinstall/tasks/0060-resolvconf.yml | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/roles/kubernetes/preinstall/handlers/main.yml b/roles/kubernetes/preinstall/handlers/main.yml
index 34502d565..cf05200e3 100644
--- a/roles/kubernetes/preinstall/handlers/main.yml
+++ b/roles/kubernetes/preinstall/handlers/main.yml
@@ -2,7 +2,7 @@
 - name: Preinstall | apply resolvconf cloud-init
   command: /usr/bin/coreos-cloudinit --from-file {{ resolveconf_cloud_init_conf }}
   when: ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]
-  listen: Preinstall | update resolvconf for Flatcar Container Linux by Kinvolk
+  listen: Preinstall | propagate resolvconf to k8s components
 
 - name: Preinstall | reload NetworkManager
   service:
@@ -24,7 +24,6 @@
   when: not dns_early | bool
   listen:
     - Preinstall | propagate resolvconf to k8s components
-    - Preinstall | update resolvconf for Flatcar Container Linux by Kinvolk
     - Preinstall | update resolvconf for networkmanager
 
 # FIXME(mattymo): Also restart for kubeadm mode
@@ -119,7 +118,6 @@
     - ('kube_control_plane' in group_names)
     - dns_mode != 'none'
     - resolvconf_mode == 'host_resolvconf'
-    - not ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"] and not is_fedora_coreos
   listen: Preinstall | propagate resolvconf to k8s components
 
 - name: Preinstall | Restart systemd-resolved
diff --git a/roles/kubernetes/preinstall/tasks/0060-resolvconf.yml b/roles/kubernetes/preinstall/tasks/0060-resolvconf.yml
index b7e9a1ec9..017d34d24 100644
--- a/roles/kubernetes/preinstall/tasks/0060-resolvconf.yml
+++ b/roles/kubernetes/preinstall/tasks/0060-resolvconf.yml
@@ -53,5 +53,5 @@
     src: resolvconf.j2
     owner: root
     mode: "0644"
-  notify: Preinstall | update resolvconf for Flatcar Container Linux by Kinvolk
+  notify: Preinstall | propagate resolvconf to k8s components
   when: ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]