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.
This commit is contained in:
Yang-Ming Lin
2026-04-03 22:47:03 +08:00
committed by GitHub
parent 6006fe4303
commit 65352fef39
2 changed files with 2 additions and 4 deletions

View File

@@ -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

View File

@@ -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"]