Merge pull request #2344 from hswong3i/local_volume_provisioner_fixup

Upgrade Local Volume Provisioner Addon to v2.0.0

roles/kubernetes/node/templates/kubelet-container.j2

@@ -27,7 +27,7 @@
   -v {{kube_config_dir}}:{{kube_config_dir}}:ro \
   -v /etc/os-release:/etc/os-release:ro \
 {% if local_volume_provisioner_enabled == true %}
-  -v {{ local_volume_base_dir }}:{{ local_volume_base_dir }}:shared \
+  -v {{ local_volume_provisioner_base_dir }}:{{ local_volume_provisioner_base_dir }}:shared \
 {% endif %}
   {{ hyperkube_image_repo }}:{{ hyperkube_image_tag}} \
   ./hyperkube kubelet \

roles/kubernetes/node/templates/kubelet.rkt.service.j2

@@ -37,7 +37,7 @@ ExecStart=/usr/bin/rkt run \
         --volume var-lib-kubelet,kind=host,source=/var/lib/kubelet,readOnly=false,recursive=true \
         --volume var-log,kind=host,source=/var/log \
 {% if local_volume_provisioner_enabled == true %}
-        --volume local-volume-base-dir,kind=host,source={{ local_volume_base_dir }},readOnly=false,recursive=true \
+        --volume local-volume-provisioner-base-dir,kind=host,source={{ local_volume_provisioner_base_dir }},readOnly=false,recursive=true \
 {% endif %}
 {% if kube_network_plugin in ["calico", "weave", "canal", "flannel", "contiv", "cilium"] %}
         --volume etc-cni,kind=host,source=/etc/cni,readOnly=true \
@@ -68,7 +68,7 @@ ExecStart=/usr/bin/rkt run \
         --mount volume=var-log,target=/var/log \
         --mount volume=hosts,target=/etc/hosts \
 {% if local_volume_provisioner_enabled == true %}
-        --mount volume=local-volume-base-dir,target={{ local_volume_base_dir }} \
+        --mount volume=local-volume-provisioner-base-dir,target={{ local_volume_provisioner_base_dir }} \
 {% endif %}
 {% if kubelet_flexvolumes_plugins_dir is defined %}
         --mount volume=flexvolumes,target={{ kubelet_flexvolumes_plugins_dir }} \