From cbb96feb1d04afbc2839737364681fa0e898cff5 Mon Sep 17 00:00:00 2001
From: Steve Leon <kokhang@gmail.com>
Date: Thu, 12 Oct 2017 14:57:19 -0700
Subject: [PATCH] Overriding service via drop-in file instead of sed

fixes https://github.com/rook/rook/issues/1057
---
 tests/scripts/kubeadm.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/scripts/kubeadm.sh b/tests/scripts/kubeadm.sh
index c196ae690..aed2210e3 100755
--- a/tests/scripts/kubeadm.sh
+++ b/tests/scripts/kubeadm.sh
@@ -22,7 +22,10 @@ install_master(){
     # This is needed on K8S 1.6 to fix a regression. https://github.com/kubernetes/kubernetes/issues/47109
     if [[ $KUBE_VERSION == v1.6* ]] ;
     then
-        sudo sed -i 's/KUBELET_SYSTEM_PODS_ARGS=/KUBELET_SYSTEM_PODS_ARGS=--enable-controller-attach-detach=false /g' /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
+        cat << EOF | sudo tee -a /etc/systemd/system/kubelet.service.d/11-disable_attachdetach_controller.conf
+[Service]
+Environment="KUBELET_SYSTEM_PODS_ARGS=--pod-manifest-path=/etc/kubernetes/manifests --allow-privileged=true --enable-controller-attach-detach=false"
+EOF
         sudo systemctl daemon-reload
     fi