From c5c2cf16a039fbefb22057801f5bb0869801cac7 Mon Sep 17 00:00:00 2001
From: Tushar240503 <98592305+Tushar240503@users.noreply.github.com>
Date: Tue, 3 Feb 2026 14:14:29 +0530
Subject: [PATCH] Move inline defaults to defaults/main.yml (#12926)

---
 roles/container-engine/docker/tasks/main.yml  | 4 ++--
 roles/kubernetes/node-taint/defaults/main.yml | 2 ++
 roles/kubernetes/node-taint/tasks/main.yml    | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 roles/kubernetes/node-taint/defaults/main.yml

diff --git a/roles/container-engine/docker/tasks/main.yml b/roles/container-engine/docker/tasks/main.yml
index 62293264d..db6242293 100644
--- a/roles/container-engine/docker/tasks/main.yml
+++ b/roles/container-engine/docker/tasks/main.yml
@@ -55,7 +55,7 @@
   register: keyserver_task_result
   until: keyserver_task_result is succeeded
   retries: 4
-  delay: "{{ retry_stagger | d(3) }}"
+  delay: "{{ retry_stagger }}"
   with_items: "{{ docker_repo_key_info.repo_keys }}"
   environment: "{{ proxy_env }}"
   when: ansible_pkg_mgr == 'apt'
@@ -128,7 +128,7 @@
   register: docker_task_result
   until: docker_task_result is succeeded
   retries: 4
-  delay: "{{ retry_stagger | d(3) }}"
+  delay: "{{ retry_stagger }}"
   notify: Restart docker
   when:
     - not ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]
diff --git a/roles/kubernetes/node-taint/defaults/main.yml b/roles/kubernetes/node-taint/defaults/main.yml
new file mode 100644
index 000000000..4ee582043
--- /dev/null
+++ b/roles/kubernetes/node-taint/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+node_taints: []
diff --git a/roles/kubernetes/node-taint/tasks/main.yml b/roles/kubernetes/node-taint/tasks/main.yml
index 0766dc439..6d203e34f 100644
--- a/roles/kubernetes/node-taint/tasks/main.yml
+++ b/roles/kubernetes/node-taint/tasks/main.yml
@@ -14,13 +14,13 @@
 
 - name: Populate inventory node taint
   set_fact:
-    inventory_node_taints: "{{ inventory_node_taints + ['%s' | format(item)] }}"
-  loop: "{{ node_taints | d([]) }}"
+    inventory_node_taints: "{{ inventory_node_taints + node_taints }}"
   when:
     - node_taints is defined
     - node_taints is not string
     - node_taints is not mapping
     - node_taints is iterable
+
 - debug:  # noqa name[missing]
     var: role_node_taints
 - debug:  # noqa name[missing]