fix a few tasks falsely reporting "changed" (#6269)
Co-authored-by: Hans Feldt <hafe@users.noreply.github.com>pull/6157/head
parent
06391b6dd9
commit
a8740c6e13
|
@ -30,23 +30,26 @@
|
||||||
- kubeadm_ca_stat.stat.exists
|
- kubeadm_ca_stat.stat.exists
|
||||||
delegate_to: "{{ groups['kube-master'][0] }}"
|
delegate_to: "{{ groups['kube-master'][0] }}"
|
||||||
run_once: true
|
run_once: true
|
||||||
|
changed_when: false
|
||||||
|
|
||||||
- name: Create kubeadm token for joining nodes with 24h expiration (default)
|
- name: Create kubeadm token for joining nodes with 24h expiration (default)
|
||||||
command: "{{ bin_dir }}/kubeadm token create"
|
command: "{{ bin_dir }}/kubeadm token create"
|
||||||
register: temp_token
|
register: temp_token
|
||||||
delegate_to: "{{ groups['kube-master'][0] }}"
|
delegate_to: "{{ groups['kube-master'][0] }}"
|
||||||
when: kubeadm_token is not defined
|
when: kubeadm_token is not defined
|
||||||
|
changed_when: false
|
||||||
|
|
||||||
- name: Set kubeadm_token to generated token
|
- name: Set kubeadm_token to generated token
|
||||||
set_fact:
|
set_fact:
|
||||||
kubeadm_token: "{{ temp_token.stdout }}"
|
kubeadm_token: "{{ temp_token.stdout }}"
|
||||||
when: kubeadm_token is not defined
|
when: kubeadm_token is not defined
|
||||||
|
|
||||||
- name: gets the kubeadm version
|
- name: Get the kubeadm version
|
||||||
command: "{{ bin_dir }}/kubeadm version -o short"
|
command: "{{ bin_dir }}/kubeadm version -o short"
|
||||||
register: kubeadm_output
|
register: kubeadm_output
|
||||||
|
changed_when: false
|
||||||
|
|
||||||
- name: sets kubeadm api version to v1beta2
|
- name: Set kubeadm api version to v1beta2
|
||||||
set_fact:
|
set_fact:
|
||||||
kubeadmConfig_api_version: v1beta2
|
kubeadmConfig_api_version: v1beta2
|
||||||
|
|
||||||
|
|
|
@ -164,6 +164,7 @@
|
||||||
shell: >-
|
shell: >-
|
||||||
{{ bin_dir }}/kubeadm --kubeconfig /etc/kubernetes/admin.conf token delete {{ kubeadm_token }} || :;
|
{{ bin_dir }}/kubeadm --kubeconfig /etc/kubernetes/admin.conf token delete {{ kubeadm_token }} || :;
|
||||||
{{ bin_dir }}/kubeadm --kubeconfig /etc/kubernetes/admin.conf token create {{ kubeadm_token }}
|
{{ bin_dir }}/kubeadm --kubeconfig /etc/kubernetes/admin.conf token create {{ kubeadm_token }}
|
||||||
|
changed_when: false
|
||||||
when:
|
when:
|
||||||
- inventory_hostname == groups['kube-master']|first
|
- inventory_hostname == groups['kube-master']|first
|
||||||
- kubeadm_token is defined
|
- kubeadm_token is defined
|
||||||
|
@ -173,6 +174,7 @@
|
||||||
|
|
||||||
- name: Create kubeadm token for joining nodes with 24h expiration (default)
|
- name: Create kubeadm token for joining nodes with 24h expiration (default)
|
||||||
command: "{{ bin_dir }}/kubeadm --kubeconfig /etc/kubernetes/admin.conf token create"
|
command: "{{ bin_dir }}/kubeadm --kubeconfig /etc/kubernetes/admin.conf token create"
|
||||||
|
changed_when: false
|
||||||
register: temp_token
|
register: temp_token
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 5
|
delay: 5
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
---
|
---
|
||||||
- name: gets the kubeadm version
|
- name: Get the kubeadm version
|
||||||
command: "{{ bin_dir }}/kubeadm version -o short"
|
command: "{{ bin_dir }}/kubeadm version -o short"
|
||||||
register: kubeadm_output
|
register: kubeadm_output
|
||||||
|
changed_when: false
|
||||||
|
|
||||||
- name: sets kubeadm api version to v1beta2
|
- name: Set kubeadm api version to v1beta2
|
||||||
set_fact:
|
set_fact:
|
||||||
kubeadmConfig_api_version: v1beta2
|
kubeadmConfig_api_version: v1beta2
|
||||||
|
|
||||||
|
|
|
@ -6,11 +6,12 @@
|
||||||
state: directory
|
state: directory
|
||||||
when: dynamic_kubelet_configuration
|
when: dynamic_kubelet_configuration
|
||||||
|
|
||||||
- name: gets the kubeadm version
|
- name: Get the kubeadm version
|
||||||
command: "{{ bin_dir }}/kubeadm version -o short"
|
command: "{{ bin_dir }}/kubeadm version -o short"
|
||||||
register: kubeadm_output
|
register: kubeadm_output
|
||||||
|
changed_when: false
|
||||||
|
|
||||||
- name: sets kubelet api version to v1beta1
|
- name: Set kubelet api version to v1beta1
|
||||||
set_fact:
|
set_fact:
|
||||||
kubeletConfig_api_version: v1beta1
|
kubeletConfig_api_version: v1beta1
|
||||||
tags:
|
tags:
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
state: present
|
state: present
|
||||||
check_mode: yes
|
check_mode: yes
|
||||||
register: os_variant_coreos
|
register: os_variant_coreos
|
||||||
|
changed_when: false
|
||||||
|
|
||||||
- name: set is_fedora_coreos
|
- name: set is_fedora_coreos
|
||||||
set_fact:
|
set_fact:
|
||||||
|
|
Loading…
Reference in New Issue