From d0ae3169346b60f371f73d794fb0d03e33bdb3cc Mon Sep 17 00:00:00 2001
From: Etienne <etienne.tremel@orange.fr>
Date: Tue, 26 Mar 2019 11:03:19 +0100
Subject: [PATCH] Use proxy_env with kubeadm phase commands (#4325)

---
 roles/kubernetes/client/tasks/main.yml                | 1 +
 roles/kubernetes/master/tasks/kubeadm-certificate.yml | 2 ++
 roles/kubernetes/master/tasks/kubeadm-kubeconfig.yml  | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/roles/kubernetes/client/tasks/main.yml b/roles/kubernetes/client/tasks/main.yml
index dae323f0e..71b505a47 100644
--- a/roles/kubernetes/client/tasks/main.yml
+++ b/roles/kubernetes/client/tasks/main.yml
@@ -52,6 +52,7 @@
     --cert-dir {{ kube_config_dir }}/ssl
     --apiserver-advertise-address {{ external_apiserver_address }}
     --apiserver-bind-port {{ external_apiserver_port }}
+  environment: "{{ proxy_env }}"
   run_once: yes
   register: admin_kubeconfig
 
diff --git a/roles/kubernetes/master/tasks/kubeadm-certificate.yml b/roles/kubernetes/master/tasks/kubeadm-certificate.yml
index a2ce2d676..6072085e0 100644
--- a/roles/kubernetes/master/tasks/kubeadm-certificate.yml
+++ b/roles/kubernetes/master/tasks/kubeadm-certificate.yml
@@ -27,6 +27,7 @@
 
 - name: Generate new certs and keys
   command: "{{ bin_dir }}/kubeadm init phase certs {{ item }} --config={{ kube_config_dir }}/kubeadm-config.yaml"
+  environment: "{{ proxy_env }}"
   with_items:
     - apiserver
     - apiserver-kubelet-client
@@ -35,6 +36,7 @@
 
 - name: Generate new certs and keys
   command: "{{ bin_dir }}/kubeadm alpha phase certs {{ item }} --config={{ kube_config_dir }}/kubeadm-config.yaml"
+  environment: "{{ proxy_env }}"
   with_items:
     - apiserver
     - apiserver-kubelet-client
diff --git a/roles/kubernetes/master/tasks/kubeadm-kubeconfig.yml b/roles/kubernetes/master/tasks/kubeadm-kubeconfig.yml
index 5e48773e6..7f4bfbf56 100644
--- a/roles/kubernetes/master/tasks/kubeadm-kubeconfig.yml
+++ b/roles/kubernetes/master/tasks/kubeadm-kubeconfig.yml
@@ -23,10 +23,12 @@
 
 - name: Generate new configuration files
   command: "{{ bin_dir }}/kubeadm init phase kubeconfig all --config={{ kube_config_dir }}/kubeadm-config.yaml"
+  environment: "{{ proxy_env }}"
   when: kubeadm_version is version('v1.13.0', '>=')
   ignore_errors: yes
 
 - name: Generate new configuration files
   command: "{{ bin_dir }}/kubeadm alpha phase kubeconfig all --config={{ kube_config_dir }}/kubeadm-config.yaml"
+  environment: "{{ proxy_env }}"
   when: kubeadm_version is version('v1.13.0', '<')
   ignore_errors: yes