External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-04-04 17:55:12 -02:30
Code Issues Packages Projects Releases Wiki Activity

local_volumes_enabled replaced by local_volume_provisioner_enabled

Browse Source
This commit is contained in:
Erwan Miran
2018-02-06 17:12:09 +01:00
parent a69db4169b
commit 8006a6cd82
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes/node/templates/kubelet-container.j2
View File

@@ -26,7 +26,7 @@
-v /var/run:/var/run:rw \ -v /var/run:/var/run:rw \
-v {{kube_config_dir}}:{{kube_config_dir}}:ro \ -v {{kube_config_dir}}:{{kube_config_dir}}:ro \
-v /etc/os-release:/etc/os-release: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 \ -v {{ local_volume_base_dir }}:{{ local_volume_base_dir }}:shared \
{% endif %} {% endif %}
{{ hyperkube_image_repo }}:{{ hyperkube_image_tag}} \ {{ hyperkube_image_repo }}:{{ hyperkube_image_tag}} \

4
roles/kubernetes/node/templates/kubelet.rkt.service.j2
View File

@@ -36,7 +36,7 @@ ExecStart=/usr/bin/rkt run \
--volume var-lib-docker,kind=host,source={{ docker_daemon_graph }},readOnly=false \ --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-lib-kubelet,kind=host,source=/var/lib/kubelet,readOnly=false,recursive=true \
--volume var-log,kind=host,source=/var/log \ --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 \ --volume local-volume-base-dir,kind=host,source={{ local_volume_base_dir }},readOnly=false,recursive=true \
{% endif %} {% endif %}
{% if kube_network_plugin in ["calico", "weave", "canal", "flannel", "contiv"] %} {% 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-lib-kubelet,target=/var/lib/kubelet \
--mount volume=var-log,target=/var/log \ --mount volume=var-log,target=/var/log \
--mount volume=hosts,target=/etc/hosts \ --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 }} \ --mount volume=local-volume-base-dir,target={{ local_volume_base_dir }} \
{% endif %} {% endif %}
{% if kubelet_flexvolumes_plugins_dir is defined %} {% if kubelet_flexvolumes_plugins_dir is defined %}

4
roles/kubespray-defaults/defaults/main.yaml
View File

@@ -164,7 +164,7 @@ helm_enabled: false
istio_enabled: false istio_enabled: false
registry_enabled: false registry_enabled: false
enable_network_policy: false enable_network_policy: false
local_volumes_enabled: false local_volume_provisioner_enabled: false
persistent_volumes_enabled: false persistent_volumes_enabled: false
# Base path for local volume provisioner addon # 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 ## List of key=value pairs that describe feature gates for
## the k8s cluster. ## 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 data dirs.
vault_base_dir: /etc/vault vault_base_dir: /etc/vault

2
tests/files/centos7-flannel-addons.yml
View File

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