C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix kubeadm config extra volumes

Browse source 
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
This commit is contained in:
Chad Swenson 2019-01-15 12:26:33 -06:00
parent fce8712bff
commit 13e3e867ac
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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