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

Fix readOnly flag in kubeadm-config.v1beta1.yaml.j2

Browse source 
In v1beta1 of `ClusterConfiguration` the extraVolumes `writable` field was changed to `readOnly` and its boolean value must be negated.

Also, the json field for `useHyperKubeImage` was incorrectly capitalized.
This commit is contained in:
Chad Swenson 2019-01-09 20:43:35 -06:00
parent 435993891b
commit 1d9c0c7d17
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/kubernetes/master/defaults/main/main.yml
View file

@ -143,7 +143,7 @@ kube_kubeadm_scheduler_extra_args: {}
# - name: name # - name: name
# hostPath: /host/path # hostPath: /host/path
# mountPath: /mount/path # mountPath: /mount/path
# writable: false # readOnly: true
apiserver_extra_volumes: {} apiserver_extra_volumes: {}
controller_manager_extra_volumes: {} controller_manager_extra_volumes: {}
scheduler_extra_volumes: {} scheduler_extra_volumes: {}

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

@ -44,7 +44,7 @@ controlPlaneEndpoint: {{ ip | default(ansible_default_ipv4.address) }}:{{ kube_a
{% endif %} {% endif %}
certificatesDir: {{ kube_cert_dir }} certificatesDir: {{ kube_cert_dir }}
imageRepository: {{ kube_image_repo }} imageRepository: {{ kube_image_repo }}
UseHyperKubeImage: false useHyperKubeImage: false
apiServer: apiServer:
extraArgs: extraArgs:
authorization-mode: {{ authorization_modes | join(',') }} authorization-mode: {{ authorization_modes | join(',') }}
@ -151,14 +151,14 @@ apiServer:
- name: {{ audit_log_name }} - name: {{ audit_log_name }}
hostPath: {{ audit_log_hostpath }} hostPath: {{ audit_log_hostpath }}
mountPath: {{ audit_log_mountpath }} mountPath: {{ audit_log_mountpath }}
writable: true readOnly: false
{% endif %} {% endif %}
{% endif %} {% endif %}
{% for volume in apiserver_extra_volumes %} {% for volume in apiserver_extra_volumes %}
- name: {{ volume.name }} - name: {{ volume.name }}
hostPath: {{ volume.hostPath }} hostPath: {{ volume.hostPath }}
mountPath: {{ volume.mountPath }} mountPath: {{ volume.mountPath }}
writable: {{ volume.writable | default(false)}} readOnly: {{ volume.readOnly | d(not volume.writable) }}
{% 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 }}
writable: {{ volume.writable | default(false)}} readOnly: {{ volume.readOnly | d(not volume.writable) }}
{% 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 }}
writable: {{ volume.writable | default(false)}} readOnly: {{ volume.readOnly | d(not volume.writable) }}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
--- ---