mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-28 09:39:12 +03:00
Fix proxy usage when *_PROXY are present in environment (#7309)
Sincea790935d02all proxy users should be properly configured Now when you have *_PROXY vars in your environment it can leads to failure if NO_PROXY is not correct, or to persistent configuration changes as seen with kubeadm in1c5391dda7Instead of playing constant whack-a-bug, inject empty *_PROXY vars everywhere at the play level, and override at the task level when needed Signed-off-by: Etienne Champetier <e.champetier@ateme.com>
This commit is contained in:
committed by
GitHub
parent
ed2b4b805e
commit
067db686f6
@@ -22,7 +22,6 @@
|
||||
{{ kubeadm_discovery_address }}
|
||||
args:
|
||||
creates: "{{ kube_cert_dir }}/apiserver-etcd-client.key"
|
||||
environment: "{{ proxy_disable_env }}"
|
||||
|
||||
- name: Delete unneeded certificates
|
||||
file:
|
||||
|
||||
@@ -42,7 +42,6 @@
|
||||
|
||||
- name: Create kubeadm token for joining nodes with 24h expiration (default)
|
||||
command: "{{ bin_dir }}/kubeadm token create"
|
||||
environment: "{{ proxy_disable_env }}"
|
||||
register: temp_token
|
||||
delegate_to: "{{ groups['kube-master'][0] }}"
|
||||
when: kubeadm_token is not defined
|
||||
@@ -55,7 +54,6 @@
|
||||
|
||||
- name: Get the kubeadm version
|
||||
command: "{{ bin_dir }}/kubeadm version -o short"
|
||||
environment: "{{ proxy_disable_env }}"
|
||||
register: kubeadm_output
|
||||
changed_when: false
|
||||
|
||||
@@ -71,7 +69,8 @@
|
||||
when: not is_kube_master
|
||||
|
||||
- name: Join to cluster if needed
|
||||
environment: '{{ proxy_disable_env | combine({"PATH": "{{ bin_dir }}:{{ ansible_env.PATH }}:/sbin"}) }}'
|
||||
environment:
|
||||
PATH: "{{ bin_dir }}:{{ ansible_env.PATH }}:/sbin"
|
||||
when: not is_kube_master and (not kubelet_conf.stat.exists)
|
||||
block:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user