From 8006a6cd82b0e8c517962ef328006eb5fa645e47 Mon Sep 17 00:00:00 2001
From: Erwan Miran <mirwan666@gmail.com>
Date: Tue, 6 Feb 2018 17:12:09 +0100
Subject: [PATCH] local_volumes_enabled replaced by
local_volume_provisioner_enabled
---
roles/kubernetes/node/templates/kubelet-container.j2 | 2 +-
roles/kubernetes/node/templates/kubelet.rkt.service.j2 | 4 ++--
roles/kubespray-defaults/defaults/main.yaml | 4 ++--
tests/files/centos7-flannel-addons.yml | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/roles/kubernetes/node/templates/kubelet-container.j2 b/roles/kubernetes/node/templates/kubelet-container.j2
index cf91b5978..6549a7044 100644
--- a/roles/kubernetes/node/templates/kubelet-container.j2
+++ b/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}} \
diff --git a/roles/kubernetes/node/templates/kubelet.rkt.service.j2 b/roles/kubernetes/node/templates/kubelet.rkt.service.j2
index eefce0597..f78a55256 100644
--- a/roles/kubernetes/node/templates/kubelet.rkt.service.j2
+++ b/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 %}
diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
index 98bc57288..fd13417eb 100644
--- a/roles/kubespray-defaults/defaults/main.yaml
+++ b/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
diff --git a/tests/files/centos7-flannel-addons.yml b/tests/files/centos7-flannel-addons.yml
index f2d77dbca..001573494 100644
--- a/tests/files/centos7-flannel-addons.yml
+++ b/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
--
GitLab