diff --git a/roles/kubernetes-apps/cloud_controller/oci/templates/controller-manager-config.yml.j2 b/roles/kubernetes-apps/cloud_controller/oci/templates/controller-manager-config.yml.j2 index 36b4b2df7a524a07659b091d363effe848629324..695cc55b459fe2dc68423cfb5ab13401e90f38ef 100644 --- a/roles/kubernetes-apps/cloud_controller/oci/templates/controller-manager-config.yml.j2 +++ b/roles/kubernetes-apps/cloud_controller/oci/templates/controller-manager-config.yml.j2 @@ -66,7 +66,7 @@ loadBalancer: {% if oci_security_lists is defined and oci_security_lists|length > 0 %} # Optional specification of which security lists to modify per subnet. This does not apply if security list management is off. securityLists: -{% for subnet_ocid, list_ocid in oci_security_lists.iteritems() %} +{% for subnet_ocid, list_ocid in oci_security_lists.items() %} {{ subnet_ocid }}: {{ list_ocid }} {% endfor %} {% endif %} diff --git a/roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-cm.yml.j2 b/roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-cm.yml.j2 index 7dc4f2fa421b46907522493364fcb7f5640b10ff..4f67c0e6ae58b0d3bfdde388a6502056a9a324f4 100644 --- a/roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-cm.yml.j2 +++ b/roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-cm.yml.j2 @@ -17,7 +17,7 @@ metadata: namespace: {{ local_volume_provisioner_namespace }} data: storageClassMap: | -{% for class_name, storage_class in local_volume_provisioner_storage_classes.iteritems() %} +{% for class_name, storage_class in local_volume_provisioner_storage_classes.items() %} {{ class_name }}: {{- convert_keys(storage_class) }} {{ storage_class | to_nice_yaml(indent=2) | indent(6) }} diff --git a/roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-ds.yml.j2 b/roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-ds.yml.j2 index 28062aae3b066f6c16328e84b0a1d7ee3b5d98e0..b1c05c244facfb37960ae3581a92d537e044a436 100644 --- a/roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-ds.yml.j2 +++ b/roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-ds.yml.j2 @@ -44,7 +44,7 @@ spec: - name: local-volume-provisioner mountPath: /etc/provisioner/config readOnly: true -{% for class_name, class_config in local_volume_provisioner_storage_classes.iteritems() %} +{% for class_name, class_config in local_volume_provisioner_storage_classes.items() %} - name: local-volume-provisioner-hostpath-{{ class_name }} mountPath: {{ class_config.mount_dir }} mountPropagation: "HostToContainer" @@ -53,7 +53,7 @@ spec: - name: local-volume-provisioner configMap: name: local-volume-provisioner -{% for class_name, class_config in local_volume_provisioner_storage_classes.iteritems() %} +{% for class_name, class_config in local_volume_provisioner_storage_classes.items() %} - name: local-volume-provisioner-hostpath-{{ class_name }} hostPath: path: {{ class_config.host_dir }} diff --git a/roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-psp.yml.j2 b/roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-psp.yml.j2 index a7442f123c2a0ecabc2a3967eef77f0beacfe798..12bdd04010816cb9cd74c23787978b7ec6eeb98d 100644 --- a/roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-psp.yml.j2 +++ b/roles/kubernetes-apps/external_provisioner/local_volume_provisioner/templates/local-volume-provisioner-psp.yml.j2 @@ -25,7 +25,7 @@ spec: - 'downwardAPI' - 'hostPath' allowedHostPaths: -{% for class_name, class_config in local_volume_provisioner_storage_classes.iteritems() %} +{% for class_name, class_config in local_volume_provisioner_storage_classes.items() %} - pathPrefix: "{{ class_config.host_dir }}" readOnly: false {% endfor %}