From ff827ea45c00d15a73f8506d454559b681b5891f Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Mon, 2 Nov 2020 16:11:58 +0100 Subject: [PATCH] DEBUG --- .../_base/units/kubelet.service.yaml | 17 +++++++++++++++++ .../_base/units/kubelet.service.yaml | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/templates/master/01-master-kubelet/_base/units/kubelet.service.yaml b/templates/master/01-master-kubelet/_base/units/kubelet.service.yaml index f0f00cf6c9..1088132f2d 100644 --- a/templates/master/01-master-kubelet/_base/units/kubelet.service.yaml +++ b/templates/master/01-master-kubelet/_base/units/kubelet.service.yaml @@ -40,3 +40,20 @@ contents: | [Install] WantedBy=multi-user.target +dropins: +- name: 10-mco-default-env.conf + contents: | + [Unit] + Description=MCO environment configuration + {{if .Proxy -}} + [Service] + {{if .Proxy.HTTPProxy -}} + Environment=HTTP_PROXY={{.Proxy.HTTPProxy}} + {{end -}} + {{if .Proxy.HTTPSProxy -}} + Environment=HTTPS_PROXY={{.Proxy.HTTPSProxy}} + {{end -}} + {{if .Proxy.NoProxy -}} + Environment=NO_PROXY={{.Proxy.NoProxy}} + {{end -}} + {{end -}} diff --git a/templates/worker/01-worker-kubelet/_base/units/kubelet.service.yaml b/templates/worker/01-worker-kubelet/_base/units/kubelet.service.yaml index c7a4ae012c..f07a058793 100644 --- a/templates/worker/01-worker-kubelet/_base/units/kubelet.service.yaml +++ b/templates/worker/01-worker-kubelet/_base/units/kubelet.service.yaml @@ -39,3 +39,20 @@ contents: | [Install] WantedBy=multi-user.target +dropins: +- name: 10-mco-default-env.conf + contents: | + [Unit] + Description=MCO environment configuration + {{if .Proxy -}} + [Service] + {{if .Proxy.HTTPProxy -}} + Environment=HTTP_PROXY={{.Proxy.HTTPProxy}} + {{end -}} + {{if .Proxy.HTTPSProxy -}} + Environment=HTTPS_PROXY={{.Proxy.HTTPSProxy}} + {{end -}} + {{if .Proxy.NoProxy -}} + Environment=NO_PROXY={{.Proxy.NoProxy}} + {{end -}} + {{end -}}