Fix macro on local_volume_provisioner (kubernetes-sigs#5168)

mydict.keys() should be converted to list, otherwise it causes errors in loop iteration. Remove extra space after class name, which broke configmap. Also allow set reclaimPolicy property.
reynencourt · Sep 13, 2019 · cb4f797 · cb4f797
1 parent eb40ac1
commit cb4f797
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/...xternal_provisioner/local_volume_provisioner/templates/local-volume-provisioner-cm.yml.j2 b/...xternal_provisioner/local_volume_provisioner/templates/local-volume-provisioner-cm.yml.j2
@@ -1,6 +1,6 @@
 # Macro to convert camelCase dictionary keys to snake_case keys
-{%- macro convert_keys(mydict) %}
-  {% for key in mydict.keys() -%}
+{% macro convert_keys(mydict) -%}
+  {% for key in mydict.keys()|list -%}
     {% set key_split = key.split('_') -%}
     {% set new_key = key_split[0] + key_split[1:]|map('capitalize')|join -%}
     {% set value = mydict.pop(key) -%}
@@ -21,5 +21,4 @@ data:
     {{ class_name }}:
       {{- convert_keys(storage_class) }}
       {{ storage_class | to_nice_yaml(indent=2) | indent(6) }}
-{% endfor %}
-
+{%- endfor %}
diff --git a/...xternal_provisioner/local_volume_provisioner/templates/local-volume-provisioner-sc.yml.j2 b/...xternal_provisioner/local_volume_provisioner/templates/local-volume-provisioner-sc.yml.j2
@@ -1,9 +1,12 @@
-{% for class_name in local_volume_provisioner_storage_classes.keys() %}
+{% for class_name, class_config in local_volume_provisioner_storage_classes.items() %}
 ---
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: {{ class_name }}
 provisioner: kubernetes.io/no-provisioner
 volumeBindingMode: WaitForFirstConsumer
+{% if class_config.reclaim_policy is defined %}
+reclaimPolicy: {{ class_config.reclaim_policy }}
+{% endif %}
 {% endfor %}