From 353d44a4a6abb3be23b6af9096b75e1160bd9e92 Mon Sep 17 00:00:00 2001
From: Maxime Guyot <Miouge1@users.noreply.github.com>
Date: Thu, 30 Apr 2020 14:44:17 +0200
Subject: [PATCH] Add CI var for http_proxy (#6039)
---
roles/kubespray-defaults/tasks/no_proxy.yml | 3 +++
tests/files/packet_debian10-containerd.yml | 4 ++++
2 files changed, 7 insertions(+)
diff --git a/roles/kubespray-defaults/tasks/no_proxy.yml b/roles/kubespray-defaults/tasks/no_proxy.yml
index efff7d398..73fa0bbfa 100644
--- a/roles/kubespray-defaults/tasks/no_proxy.yml
+++ b/roles/kubespray-defaults/tasks/no_proxy.yml
@@ -26,3 +26,6 @@
- name: Populates no_proxy to all hosts
set_fact:
no_proxy: "{{ hostvars.localhost.no_proxy_prepare }}"
+ proxy_env:
+ no_proxy: "{{ hostvars.localhost.no_proxy_prepare }}"
+ NO_PROXY: "{{ hostvars.localhost.no_proxy_prepare }}"
diff --git a/tests/files/packet_debian10-containerd.yml b/tests/files/packet_debian10-containerd.yml
index 6845bcb80..e00a2904f 100644
--- a/tests/files/packet_debian10-containerd.yml
+++ b/tests/files/packet_debian10-containerd.yml
@@ -11,3 +11,7 @@ dns_min_replicas: 1
helm_enabled: true
helm_version: v3.1.0
+
+# https://gitlab.com/miouge/kubespray-ci/-/blob/a4fd5ed6857807f1c353cb60848aedebaf7d2c94/manifests/http-proxy.yml#L42
+http_proxy: http://172.30.30.30:8888
+https_proxy: http://172.30.30.30:8888
\ No newline at end of file
--
GitLab