epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-15 22:34:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: add option to use custome CA for https_proxy (#10215)

Browse Source
This commit is contained in:
Vyacheslav Vershinin
2023-06-23 19:59:24 +03:00
committed by GitHub
parent 2fa64f9fd6
commit 180df831ba
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/kubespray-defaults/defaults/main.yaml
View File

@@ -652,7 +652,7 @@ host_os: >-
# Setting it to 0 allows unlimited requests per second.
kubelet_event_record_qps: 5
proxy_env:
proxy_env_defaults:
http_proxy: "{{ http_proxy | default ('') }}"
HTTP_PROXY: "{{ http_proxy | default ('') }}"
https_proxy: "{{ https_proxy | default ('') }}"
@@ -660,6 +660,10 @@ proxy_env:
no_proxy: "{{ no_proxy | default ('') }}"
NO_PROXY: "{{ no_proxy | default ('') }}"
# If we use SSL_CERT_FILE: {{ omit }} it cause in value __omit_place_holder__ and break environments
# Combine dict is avoiding the problem with omit placeholder. Maybe it can be better solution?
proxy_env: "{{ proxy_env_defaults | combine({ 'SSL_CERT_FILE': https_proxy_cert_file }) if https_proxy_cert_file is defined else proxy_env_defaults }}"
proxy_disable_env:
ALL_PROXY: ''
FTP_PROXY: ''