From 4a9a82ca86adf8671363d9ec4fca85ad5cfc0f41 Mon Sep 17 00:00:00 2001
From: Smaine Kahlouch <smaine.kahlouch@arkena.com>
Date: Wed, 18 Nov 2015 22:36:56 +0100
Subject: [PATCH] include kubernetes config

---
 .../master/templates/systemd-init/kube-proxy.service.j2          | 1 +
 .../kubernetes/node/templates/systemd-init/kube-proxy.service.j2 | 1 +
 2 files changed, 2 insertions(+)

diff --git a/roles/kubernetes/master/templates/systemd-init/kube-proxy.service.j2 b/roles/kubernetes/master/templates/systemd-init/kube-proxy.service.j2
index cc3fdc77c..b1170c5d8 100644
--- a/roles/kubernetes/master/templates/systemd-init/kube-proxy.service.j2
+++ b/roles/kubernetes/master/templates/systemd-init/kube-proxy.service.j2
@@ -8,6 +8,7 @@ After=docker.service
 {% endif %}
 
 [Service]
+EnvironmentFile=/etc/kubernetes/config
 EnvironmentFile=/etc/network-environment
 ExecStart={{ bin_dir }}/kube-proxy \
 	    $KUBE_LOGTOSTDERR \
diff --git a/roles/kubernetes/node/templates/systemd-init/kube-proxy.service.j2 b/roles/kubernetes/node/templates/systemd-init/kube-proxy.service.j2
index cc3fdc77c..b1170c5d8 100644
--- a/roles/kubernetes/node/templates/systemd-init/kube-proxy.service.j2
+++ b/roles/kubernetes/node/templates/systemd-init/kube-proxy.service.j2
@@ -8,6 +8,7 @@ After=docker.service
 {% endif %}
 
 [Service]
+EnvironmentFile=/etc/kubernetes/config
 EnvironmentFile=/etc/network-environment
 ExecStart={{ bin_dir }}/kube-proxy \
 	    $KUBE_LOGTOSTDERR \
-- 
GitLab