From e73e2837aa7a19a8451805647afcfc9e8c8c28b8 Mon Sep 17 00:00:00 2001
From: Tobias Hintze <th-git@thzn.de>
Date: Sat, 7 Sep 2019 17:52:49 +0200
Subject: [PATCH] Add proxy env to /etc/environment

`#kubeone` markers are used to allow reset and idempotency
---
 pkg/installer/installation/prerequisites.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/installer/installation/prerequisites.go b/pkg/installer/installation/prerequisites.go
index da65ac7b2..dd10b11e2 100644
--- a/pkg/installer/installation/prerequisites.go
+++ b/pkg/installer/installation/prerequisites.go
@@ -76,8 +76,12 @@ export NO_PROXY no_proxy
 
 {{ end }}
 EOF
-	`
 
+envtmp=/tmp/k1-etc-environment
+grep -v '#kubeone$' /etc/environment > $envtmp
+grep = /etc/kubeone/proxy-env | sed 's/$/#kubeone/' >> $envtmp
+sudo tee /etc/environment < $envtmp
+`
 	kubeadmDebianScript = `
 sudo swapoff -a
 sudo sed -i '/.*swap.*/d' /etc/fstab