Skip to content
Snippets Groups Projects
Unverified Commit 712bdfc8 authored by Antoine Legrand's avatar Antoine Legrand Committed by GitHub
Browse files

Merge pull request #2260 from mirwan/local_volume_provisioner_fixes

local_volume_provisioner_enabled replacement
parents fe57c13b d53f45d4
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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}} \
......
......@@ -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 %}
......
......@@ -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
......
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment