Browse Source

Fix kubeadm config extra volumes

I found a potential use case where `writable` could be null and therfore
not treated like a boolean, so this adds an extra default statement to
avoid negating a non-boolean as boolean which would lead to undefined. refs #4020
pull/4048/head
Chad Swenson 6 years ago
parent
commit
13e3e867ac
1 changed files with 3 additions and 3 deletions
  1. 6
      roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2

6
roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2

@ -158,7 +158,7 @@ apiServer:
- name: {{ volume.name }}
hostPath: {{ volume.hostPath }}
mountPath: {{ volume.mountPath }}
readOnly: {{ volume.readOnly | d(not volume.writable) }}
readOnly: {{ volume.readOnly | d(not (volume.writable | d(false))) }}
{% endfor %}
{% endif %}
certSANs:
@ -201,7 +201,7 @@ controllerManager:
- name: {{ volume.name }}
hostPath: {{ volume.hostPath }}
mountPath: {{ volume.mountPath }}
readOnly: {{ volume.readOnly | d(not volume.writable) }}
readOnly: {{ volume.readOnly | d(not (volume.writable | d(false))) }}
{% endfor %}
{% endif %}
scheduler:
@ -222,7 +222,7 @@ scheduler:
- name: {{ volume.name }}
hostPath: {{ volume.hostPath }}
mountPath: {{ volume.mountPath }}
readOnly: {{ volume.readOnly | d(not volume.writable) }}
readOnly: {{ volume.readOnly | d(not (volume.writable | d(false))) }}
{% endfor %}
{% endif %}
---

Loading…
Cancel
Save