mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-05-22 08:17:45 -02:30
Ensure kubeadm doesn't use proxy (#7275)
* Move proxy_env to kubespray-defaults/defaults There is no reasons to use set_facts here Signed-off-by: Etienne Champetier <e.champetier@ateme.com> * Ensure kubeadm doesn't use proxy *_proxy variables might be present in the environment (/etc/environment, bash profile, ...) When this is the case we end up with those proxy configuration in /etc/kubernetes/manifests/kube-*.yaml manifests We cannot unset env variables, but kubeadm is nice enough to ignore empty vars93d288e2a4/cmd/kubeadm/app/util/env.go (L27)Signed-off-by: Etienne Champetier <e.champetier@ateme.com> (cherry picked from commit1c5391dda7)
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
176df83e02
commit
40857b9859
@@ -22,6 +22,7 @@
|
||||
{{ kubeadm_discovery_address }}
|
||||
args:
|
||||
creates: "{{ kube_cert_dir }}/apiserver-etcd-client.key"
|
||||
environment: "{{ proxy_disable_env }}"
|
||||
|
||||
- name: Delete unneeded certificates
|
||||
file:
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
|
||||
- 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
|
||||
@@ -48,6 +49,7 @@
|
||||
|
||||
- name: Get the kubeadm version
|
||||
command: "{{ bin_dir }}/kubeadm version -o short"
|
||||
environment: "{{ proxy_disable_env }}"
|
||||
register: kubeadm_output
|
||||
changed_when: false
|
||||
|
||||
@@ -63,8 +65,7 @@
|
||||
when: not is_kube_master
|
||||
|
||||
- name: Join to cluster if needed
|
||||
environment:
|
||||
PATH: "{{ bin_dir }}:{{ ansible_env.PATH }}:/sbin" # Make sure we can workaround RH / CentOS conservative path management
|
||||
environment: '{{ proxy_disable_env | combine({"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