From ec1170bd371aeca5c74fcb6ba83969eccdfa416a Mon Sep 17 00:00:00 2001
From: Spencer Smith <rsmitty@users.noreply.github.com>
Date: Fri, 3 Nov 2017 03:10:37 -0400
Subject: [PATCH] only mount volumes if local_volumes_enabled is true. fix
 mount flags in rkt. (#1923)

---
 roles/kubernetes/node/templates/kubelet-container.j2   | 2 ++
 roles/kubernetes/node/templates/kubelet.rkt.service.j2 | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/roles/kubernetes/node/templates/kubelet-container.j2 b/roles/kubernetes/node/templates/kubelet-container.j2
index cabe5ef12..cf91b5978 100644
--- a/roles/kubernetes/node/templates/kubelet-container.j2
+++ b/roles/kubernetes/node/templates/kubelet-container.j2
@@ -26,7 +26,9 @@
   -v /var/run:/var/run:rw \
   -v {{kube_config_dir}}:{{kube_config_dir}}:ro \
   -v /etc/os-release:/etc/os-release:ro \
+{% if local_volumes_enabled == true %}
   -v {{ local_volume_base_dir }}:{{ local_volume_base_dir }}:shared \
+{% endif %}
   {{ hyperkube_image_repo }}:{{ hyperkube_image_tag}} \
   ./hyperkube kubelet \
   "$@"
diff --git a/roles/kubernetes/node/templates/kubelet.rkt.service.j2 b/roles/kubernetes/node/templates/kubelet.rkt.service.j2
index 4990bd7ee..90d024d03 100644
--- a/roles/kubernetes/node/templates/kubelet.rkt.service.j2
+++ b/roles/kubernetes/node/templates/kubelet.rkt.service.j2
@@ -28,11 +28,13 @@ ExecStart=/usr/bin/rkt run \
         --volume var-lib-docker,kind=host,source={{ docker_daemon_graph }},readOnly=false \
         --volume var-lib-kubelet,kind=host,source=/var/lib/kubelet,readOnly=false,recursive=true \
         --volume var-log,kind=host,source=/var/log \
+{% if local_volumes_enabled == true %}
+        --volume local-volume-base-dir,kind=host,source={{ local_volume_base_dir }},readOnly=false,recursive=true \
+{% endif %}
 {% if kube_network_plugin in ["calico", "weave", "canal", "flannel"] %}
         --volume etc-cni,kind=host,source=/etc/cni,readOnly=true \
         --volume opt-cni,kind=host,source=/opt/cni,readOnly=true \
         --volume var-lib-cni,kind=host,source=/var/lib/cni,readOnly=false \
-        --volume local-volume-base-dir,kind=host,source={{ local_volume_base_dir }},readOnly=false,recursive=true \
         --mount volume=etc-cni,target=/etc/cni \
         --mount volume=opt-cni,target=/opt/cni \
         --mount volume=var-lib-cni,target=/var/lib/cni \
@@ -50,7 +52,9 @@ ExecStart=/usr/bin/rkt run \
         --mount volume=var-lib-kubelet,target=/var/lib/kubelet \
         --mount volume=var-log,target=/var/log \
         --mount volume=hosts,target=/etc/hosts \
+{% if local_volumes_enabled == true %}
         --mount volume=local-volume-base-dir,target={{ local_volume_base_dir }} \
+{% endif %}
         --stage1-from-dir=stage1-fly.aci \
 {% if kube_hyperkube_image_repo == "docker" %}
         --insecure-options=image \