Merge pull request #4048 from chadswen/readonly-writable-fix

Fix kubeadm config extra volumes
This commit is contained in:
Chad Swenson 2019-01-15 13:02:04 -06:00 committed by GitHub
commit 0697ab4b4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

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 %}
--- ---