External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-03 09:49:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

Allow configuration of nodelabels in local_volume_provisioner (#6620)

Browse Source
This commit is contained in:
Lukas Grossar
2020-09-17 11:44:58 +02:00
committed by GitHub
parent b6b26c710f
commit a870dd368e
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
inventory/sample/group_vars/k8s-cluster/addons.yml
View File

@@ -33,6 +33,10 @@ local_path_provisioner_enabled: false
# Local volume provisioner deployment # Local volume provisioner deployment
local_volume_provisioner_enabled: false local_volume_provisioner_enabled: false
# local_volume_provisioner_namespace: kube-system # local_volume_provisioner_namespace: kube-system
# local_volume_provisioner_nodelabels:
# - kubernetes.io/hostname
# - topology.kubernetes.io/region
# - topology.kubernetes.io/zone
# local_volume_provisioner_storage_classes: # local_volume_provisioner_storage_classes:
# local-storage: # local-storage:
# host_dir: /mnt/disks # host_dir: /mnt/disks

5
roles/kubernetes-apps/external_provisioner/local_volume_provisioner/defaults/main.yml
View File

@@ -1,5 +1,10 @@
--- ---
local_volume_provisioner_namespace: "kube-system" local_volume_provisioner_namespace: "kube-system"
# List of node labels to be copied to the PVs created by the provisioner
local_volume_provisioner_nodelabels: []
# - kubernetes.io/hostname
# - topology.kubernetes.io/region
# - topology.kubernetes.io/zone
# Levarages Ansibles string to Python datatype casting. Otherwise the dict_key isn't substituted # Levarages Ansibles string to Python datatype casting. Otherwise the dict_key isn't substituted
# see https://github.com/ansible/ansible/issues/17324 # see https://github.com/ansible/ansible/issues/17324
local_volume_provisioner_storage_classes: | local_volume_provisioner_storage_classes: |

6
roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-cm.yml.j2
View File

@@ -16,6 +16,12 @@ metadata:
name: local-volume-provisioner name: local-volume-provisioner
namespace: {{ local_volume_provisioner_namespace }} namespace: {{ local_volume_provisioner_namespace }}
data: data:
{% if local_volume_provisioner_nodelabels | length > 0 %}
nodeLabelsForPV: |
{% for nodelabel in local_volume_provisioner_nodelabels %}
- {{ nodelabel }}
{% endfor %}
{% endif %}
storageClassMap: | storageClassMap: |
{% for class_name, storage_class in local_volume_provisioner_storage_classes.items() %} {% for class_name, storage_class in local_volume_provisioner_storage_classes.items() %}
{{ class_name }}: {{ class_name }}: