External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-17 00:47:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

Move inline defaults to defaults/main.yml (#12926)

Browse Source
This commit is contained in:
Tushar240503
2026-02-03 14:14:29 +05:30
committed by GitHub
parent 69e042bd9e
commit c5c2cf16a0
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/container-engine/docker/tasks/main.yml
View File

@@ -55,7 +55,7 @@
register: keyserver_task_result register: keyserver_task_result
until: keyserver_task_result is succeeded until: keyserver_task_result is succeeded
retries: 4 retries: 4
delay: "{{ retry_stagger | d(3) }}" delay: "{{ retry_stagger }}"
with_items: "{{ docker_repo_key_info.repo_keys }}" with_items: "{{ docker_repo_key_info.repo_keys }}"
environment: "{{ proxy_env }}" environment: "{{ proxy_env }}"
when: ansible_pkg_mgr == 'apt' when: ansible_pkg_mgr == 'apt'
@@ -128,7 +128,7 @@
register: docker_task_result register: docker_task_result
until: docker_task_result is succeeded until: docker_task_result is succeeded
retries: 4 retries: 4
delay: "{{ retry_stagger | d(3) }}" delay: "{{ retry_stagger }}"
notify: Restart docker notify: Restart docker
when: when:
- not ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"] - not ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"]

2
roles/kubernetes/node-taint/defaults/main.yml Normal file
View File

@@ -0,0 +1,2 @@
---
node_taints: []

4
roles/kubernetes/node-taint/tasks/main.yml
View File

@@ -14,13 +14,13 @@
- name: Populate inventory node taint - name: Populate inventory node taint
set_fact: set_fact:
inventory_node_taints: "{{ inventory_node_taints + ['%s' | format(item)] }}" inventory_node_taints: "{{ inventory_node_taints + node_taints }}"
loop: "{{ node_taints | d([]) }}"
when: when:
- node_taints is defined - node_taints is defined
- node_taints is not string - node_taints is not string
- node_taints is not mapping - node_taints is not mapping
- node_taints is iterable - node_taints is iterable
- debug: # noqa name[missing] - debug: # noqa name[missing]
var: role_node_taints var: role_node_taints
- debug: # noqa name[missing] - debug: # noqa name[missing]