External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-06-04 22:46:20 -02:30
Code Issues Packages Projects Releases Wiki Activity

Replace injected Ansible fact variables in node and control-plane roles (#13240)

Browse Source
This commit is contained in:
Nikhil Kumar
2026-06-02 07:34:51 +05:30
committed by GitHub
parent 8b234bf138
commit 2ffff07887
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes/control-plane/meta/main.yml
View File

@@ -5,6 +5,6 @@ dependencies:
user: "{{ addusers.etcd }}" user: "{{ addusers.etcd }}"
when: when:
- etcd_deployment_type == "kubeadm" - etcd_deployment_type == "kubeadm"
- not (ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk", "ClearLinux"] or is_fedora_coreos) - not (ansible_facts['os_family'] in ["Flatcar", "Flatcar Container Linux by Kinvolk", "ClearLinux"] or is_fedora_coreos)
- role: network_plugin/calico_defaults - role: network_plugin/calico_defaults
- role: etcd_defaults - role: etcd_defaults

6
roles/kubernetes/control-plane/tasks/main.yml
View File

@@ -68,7 +68,7 @@
- name: Install kubectl bash completion - name: Install kubectl bash completion
shell: "{{ bin_dir }}/kubectl completion bash >/etc/bash_completion.d/kubectl.sh" shell: "{{ bin_dir }}/kubectl completion bash >/etc/bash_completion.d/kubectl.sh"
when: ansible_os_family in ["Debian","RedHat", "Suse"] when: ansible_facts['os_family'] in ["Debian","RedHat", "Suse"]
tags: tags:
- kubectl - kubectl
ignore_errors: true # noqa ignore-errors ignore_errors: true # noqa ignore-errors
@@ -79,7 +79,7 @@
owner: root owner: root
group: root group: root
mode: "0755" mode: "0755"
when: ansible_os_family in ["Debian","RedHat", "Suse"] when: ansible_facts['os_family'] in ["Debian","RedHat", "Suse"]
tags: tags:
- kubectl - kubectl
- upgrade - upgrade
@@ -98,7 +98,7 @@
state: present state: present
marker: "# Ansible entries {mark}" marker: "# Ansible entries {mark}"
when: when:
- ansible_os_family in ["Debian","RedHat", "Suse"] - ansible_facts['os_family'] in ["Debian","RedHat", "Suse"]
- kubectl_alias is defined and kubectl_alias != "" - kubectl_alias is defined and kubectl_alias != ""
tags: tags:
- kubectl - kubectl

10
roles/kubernetes/node/tasks/facts.yml
View File

@@ -54,9 +54,9 @@
include_vars: "{{ item }}" include_vars: "{{ item }}"
with_first_found: with_first_found:
- files: - files:
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower | replace('/', '_') }}.yml" - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_version'] | lower | replace('/', '_') }}.yml"
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_release }}.yml" - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_release'] }}.yml"
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower | replace('/', '_') }}.yml" - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower | replace('/', '_') }}.yml"
- "{{ ansible_distribution | lower }}.yml" - "{{ ansible_facts['distribution'] | lower }}.yml"
- "{{ ansible_os_family | lower }}.yml" - "{{ ansible_facts['os_family'] | lower }}.yml"
skip: true skip: true