From 25be587fdd20d9b3124f42f6a740bb1b84a63314 Mon Sep 17 00:00:00 2001 From: k8s-infra-cherrypick-robot <90416843+k8s-infra-cherrypick-robot@users.noreply.github.com> Date: Wed, 23 Sep 2026 23:54:19 -0700 Subject: [PATCH] fix: skip None resolvconf paths on Ansible Core 2.19 (#13557) Empty base/head facts render to None on Ansible Core 2.19, which difference(['']) does not remove. Use select to drop both. Co-authored-by: Shuu --- roles/kubernetes/preinstall/tasks/0060-resolvconf.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/kubernetes/preinstall/tasks/0060-resolvconf.yml b/roles/kubernetes/preinstall/tasks/0060-resolvconf.yml index 6ff9cf64f..2d485dab7 100644 --- a/roles/kubernetes/preinstall/tasks/0060-resolvconf.yml +++ b/roles/kubernetes/preinstall/tasks/0060-resolvconf.yml @@ -27,7 +27,7 @@ regexp: '^{{ item[1] }}[^#]*(?=# Ansible entries BEGIN)' backup: "{{ not resolvconf_stat.stat.islnk }}" with_nested: - - "{{ [resolvconffile, base | default(''), head | default('')] | difference(['']) }}" + - "{{ [resolvconffile, base | default(''), head | default('')] | select | list }}" - [ 'search\s', 'nameserver\s', 'domain\s', 'options\s' ] notify: Preinstall | propagate resolvconf to k8s components @@ -38,7 +38,7 @@ replace: '\1' backup: "{{ not resolvconf_stat.stat.islnk }}" with_nested: - - "{{ [resolvconffile, base | default(''), head | default('')] | difference(['']) }}" + - "{{ [resolvconffile, base | default(''), head | default('')] | select | list }}" - [ 'search\s', 'nameserver\s', 'domain\s', 'options\s' ] notify: Preinstall | propagate resolvconf to k8s components