Merge pull request #2260 from mirwan/local_volume_provisioner_fixes

local_volume_provisioner_enabled replacement

inventory/group_vars/k8s-cluster.yml

@@ -169,7 +169,9 @@ istio_enabled: false
 registry_enabled: false
 
 # Local volume provisioner deployment
-local_volume_provisioner_enabled: false
+# deprecated will be removed
+local_volumes_enabled: false
+local_volume_provisioner_enabled: "{{ local_volumes_enabled }}"
 
 # Add Persistent Volumes Storage Class for corresponding cloud provider ( OpenStack is only supported now )
 persistent_volumes_enabled: false

roles/docker/docker-storage/defaults/main.yml

@@ -3,9 +3,9 @@ docker_container_storage_setup_version: v0.6.0
 docker_container_storage_setup_profile_name: kubespray
 docker_container_storage_setup_storage_driver: devicemapper
 docker_container_storage_setup_container_thinpool: docker-pool
-#It must be define a disk path for docker_container_storage_setup_devs.
-#Otherwise docker-storage-setup will be executed incorrectly.
-#docker_container_storage_setup_devs: /dev/vdb
+# It must be define a disk path for docker_container_storage_setup_devs.
+# Otherwise docker-storage-setup will be executed incorrectly.
+# docker_container_storage_setup_devs: /dev/vdb
 docker_container_storage_setup_data_size: 40%FREE
 docker_container_storage_setup_min_data_size: 2G
 docker_container_storage_setup_chunk_size: 512K

roles/docker/docker-storage/tasks/main.yml

@@ -31,7 +31,7 @@
     group: root
     mode: 0644
 
-#https://docs.docker.com/engine/installation/linux/docker-ce/centos/#install-using-the-repository
+# https://docs.docker.com/engine/installation/linux/docker-ce/centos/#install-using-the-repository
 - name: docker-storage-setup | install lvm2
   yum:
     name: lvm2

roles/kubernetes-apps/local_volume_provisioner/templates/daemonset.yml.j2

@@ -32,12 +32,12 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: metadata.namespace
-        volumes:
-          - name: discovery-vol
-            hostPath:
-              path: "{{ local_volume_base_dir }}"
-          - configMap:
-              defaultMode: 420
-              name: local-volume-config
+      volumes:
+        - name: discovery-vol
+          hostPath:
+            path: "{{ local_volume_base_dir }}"
+        - configMap:
+            defaultMode: 420
             name: local-volume-config
-          serviceAccount: local-storage-admin
+          name: local-volume-config
+      serviceAccount: local-storage-admin

roles/kubernetes-apps/meta/main.yml

@@ -33,7 +33,7 @@ dependencies:
       - apps
       - local_volume_provisioner
       - storage
-  
+
   # istio role should be last because it takes a long time to initialize and
   # will cause timeouts trying to start other addons.
   - role: kubernetes-apps/istio
@@ -41,7 +41,7 @@ dependencies:
     tags:
       - apps
       - istio
-  
+
   - role: kubernetes-apps/persistent_volumes
     when: persistent_volumes_enabled
     tags:

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

@@ -26,7 +26,7 @@
   -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 %}
+{% if local_volume_provisioner_enabled == true %}
   -v {{ local_volume_base_dir }}:{{ local_volume_base_dir }}:shared \
 {% endif %}
   {{ hyperkube_image_repo }}:{{ hyperkube_image_tag}} \

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

@@ -36,7 +36,7 @@ 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 %}
+{% if local_volume_provisioner_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", "contiv"] %}
@@ -67,7 +67,7 @@ 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 %}
+{% if local_volume_provisioner_enabled == true %}
         --mount volume=local-volume-base-dir,target={{ local_volume_base_dir }} \
 {% endif %}
 {% if kubelet_flexvolumes_plugins_dir is defined %}

roles/kubespray-defaults/defaults/main.yaml

@@ -164,7 +164,7 @@ helm_enabled: false
 istio_enabled: false
 registry_enabled: false
 enable_network_policy: false
-local_volumes_enabled: false
+local_volume_provisioner_enabled: false
 persistent_volumes_enabled: false
 
 # Base path for local volume provisioner addon
@@ -194,7 +194,7 @@ rbac_enabled: "{{ 'RBAC' in authorization_modes or kubeadm_enabled }}"
 
 ## List of key=value pairs that describe feature gates for
 ## the k8s cluster.
-kube_feature_gates: ['Initializers={{ istio_enabled|string }}', 'PersistentLocalVolumes={{ local_volumes_enabled|string }}']
+kube_feature_gates: ['Initializers={{ istio_enabled|string }}', 'PersistentLocalVolumes={{ local_volume_provisioner_enabled|string }}']
 
 # Vault data dirs.
 vault_base_dir: /etc/vault

tests/files/centos7-flannel-addons.yml

@@ -9,7 +9,7 @@ kube_network_plugin: flannel
 helm_enabled: true
 istio_enabled: true
 efk_enabled: true
-local_volumes_enabled: true
+local_volume_provisioner_enabled: true
 deploy_netchecker: true
 kubedns_min_replicas: 1
 cloud_provider: gce