mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-28 09:39:12 +03:00
Switch to Kubernetes v1.16.0 (#5189)
* Switch to Kubernetes v1.16.0 Change-Id: I5d6a9528b2d443750fc5e031aff15ad3ffead158 * Fix download localhost cached file path Change-Id: I65e79b70e3d1b37265ebc60f41b460cf4b0a0d47 * fix kubeadm etcd for v1.16 Change-Id: I6888a00fd48b530a38b0b31c4095492476af42d2 * disable tf packet jobs Change-Id: I075c4666547fdea4c50ec04864f38e2cfaa79154 * Disable contiv packet jobs. Fix kube-router Change-Id: I3170e8789e60711d4cee8faf65f2094480b79b8d * bump sonobuoy version Change-Id: Ib946905629c7c53ed88f08fb2f41c454457a0097
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
f16cc1f08d
commit
a43e0d3f95
@@ -4,14 +4,7 @@
|
||||
{{ bin_dir }}/kubeadm init phase
|
||||
--config {{ kube_config_dir }}/kubeadm-config.yaml
|
||||
upload-certs
|
||||
{% 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 }}
|
||||
{% endif %}
|
||||
register: kubeadm_upload_cert
|
||||
delegate_to: "{{ groups['kube-master'][0] }}"
|
||||
when: kubeadm_etcd_refresh_cert_key
|
||||
@@ -27,14 +20,14 @@
|
||||
{{ bin_dir }}/kubeadm join phase
|
||||
control-plane-prepare download-certs
|
||||
--certificate-key {{ kubeadm_certificate_key }}
|
||||
--experimental-control-plane
|
||||
--control-plane
|
||||
--token {{ kubeadm_token }}
|
||||
--discovery-token-unsafe-skip-ca-verification
|
||||
{{ kubeadm_discovery_address }}
|
||||
&&
|
||||
{{ bin_dir }}/kubeadm join phase
|
||||
control-plane-prepare certs
|
||||
--experimental-control-plane
|
||||
--control-plane
|
||||
--token {{ kubeadm_token }}
|
||||
--discovery-token-unsafe-skip-ca-verification
|
||||
{{ kubeadm_discovery_address }}
|
||||
|
||||
@@ -42,7 +42,6 @@
|
||||
kubeadm_token: "{{ temp_token.stdout }}"
|
||||
when: kubeadm_token is not defined
|
||||
|
||||
|
||||
- name: gets the kubeadm version
|
||||
command: "{{ bin_dir }}/kubeadm version -o short"
|
||||
register: kubeadm_output
|
||||
|
||||
Reference in New Issue
Block a user