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

Fix commands for using experimental kubeadm control plane (#5006)

Browse source
This commit is contained in:
Remous-Aris Koutsiamanis 2019-08-05 16:31:50 +02:00 committed by Kubernetes Prow Robot
parent d22634a597
commit 02ec72fa40
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
roles/kubernetes/kubeadm/tasks/kubeadm_etcd_node.yml
View file

@ -3,8 +3,13 @@
command: >- command: >-
{{ bin_dir }}/kubeadm init phase {{ bin_dir }}/kubeadm init phase
--config {{ kube_config_dir }}/kubeadm-config.yaml --config {{ kube_config_dir }}/kubeadm-config.yaml
upload-certs --experimental-upload-certs upload-certs
{% if kubeadm_certificate_key is defined %} {% if kubeadm_version is version('v1.15.0', '<') %}
--experimental-upload-certs
{% else %}
--upload-certs
{% endif %}
{% if kubeadm_certificate_key is defined and kubeadm_version is version('v1.15.0', '<') %}
--certificate-key={{ kubeadm_certificate_key }} --certificate-key={{ kubeadm_certificate_key }}
{% endif %} {% endif %}
register: kubeadm_upload_cert register: kubeadm_upload_cert

2
roles/kubernetes/master/tasks/kubeadm-setup.yml
View file

@ -113,7 +113,7 @@
{% if kubeadm_version is version('v1.14.0', '>=') %} {% if kubeadm_version is version('v1.14.0', '>=') %}
{% if kubeadm_version is version('v1.15.0', '<') %} {% if kubeadm_version is version('v1.15.0', '<') %}
--experimental-upload-certs --experimental-upload-certs
{% if kubeadm_certificate_key is defined %} {% if kubeadm_certificate_key is defined and kubeadm_version is version('v1.15.0', '<') %}
--certificate-key={{ kubeadm_certificate_key }} --certificate-key={{ kubeadm_certificate_key }}
{% endif %} {% endif %}
{% else %} {% else %}