mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-01-31 17:19:17 -03:30
Only setup *_PROXY env variables where needed (#7095)
no_proxy is a pain to get right, and having proxy variables present causes issues (k8s components get proxy configuration after upgrade, see #7100) It's better to only configure what require proxy: - the runtime (containerd/docker/crio) - the package manager + apt_key - the download tasks Tested with the following clusters - 4 CentOS 8 nodes - 1 Ubuntu 20.04 node Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
This commit is contained in:
committed by
GitHub
parent
1fcbbd3b9d
commit
a790935d02
@@ -10,6 +10,7 @@
|
||||
retries: 4
|
||||
delay: "{{ retry_stagger | d(3) }}"
|
||||
with_items: "{{ containerd_repo_key_info.repo_keys }}"
|
||||
environment: "{{ proxy_env }}"
|
||||
when:
|
||||
- ansible_os_family in ['Ubuntu', 'Debian']
|
||||
|
||||
|
||||
@@ -11,9 +11,11 @@
|
||||
path: "{{ crun_bin_dir }}/crun"
|
||||
register: crun_stat
|
||||
|
||||
# TODO: use download_file.yml
|
||||
- name: Download binary
|
||||
get_url:
|
||||
url: "{{ crun_release_url }}"
|
||||
dest: "{{ crun_bin_dir }}/crun"
|
||||
mode: '0755'
|
||||
when: not crun_stat.stat.exists
|
||||
environment: "{{ proxy_env }}"
|
||||
|
||||
@@ -74,6 +74,7 @@
|
||||
retries: 4
|
||||
delay: "{{ retry_stagger | d(3) }}"
|
||||
with_items: "{{ docker_repo_key_info.repo_keys }}"
|
||||
environment: "{{ proxy_env }}"
|
||||
when: not (ansible_os_family in ["Flatcar Container Linux by Kinvolk", "RedHat", "Suse", "ClearLinux"] or is_ostree)
|
||||
|
||||
- name: ensure docker-ce repository is enabled
|
||||
@@ -95,6 +96,7 @@
|
||||
retries: 4
|
||||
delay: "{{ retry_stagger | d(3) }}"
|
||||
with_items: "{{ dockerproject_repo_key_info.repo_keys }}"
|
||||
environment: "{{ proxy_env }}"
|
||||
when:
|
||||
- not (ansible_os_family in ["Flatcar Container Linux by Kinvolk", "RedHat", "Suse", "ClearLinux"] or is_ostree)
|
||||
- use_docker_engine is defined and use_docker_engine
|
||||
|
||||
Reference in New Issue
Block a user