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:
Matthew Mosesohn
2019-10-02 12:21:07 +03:00
committed by Kubernetes Prow Robot
parent f16cc1f08d
commit a43e0d3f95
21 changed files with 55 additions and 153 deletions

View File

@@ -15,14 +15,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
when:
- inventory_hostname == groups['kube-master']|first
@@ -60,9 +53,6 @@
{{ bin_dir }}/kubeadm join
--config {{ kube_config_dir }}/kubeadm-controlplane.yaml
--ignore-preflight-errors=all
{% if kubeadm_certificate_key is defined and kubeadm_version is version('v1.15.0', '<') %}
--certificate-key={{ kubeadm_certificate_key }}
{% endif %}
register: kubeadm_join_control_plane
retries: 3
until: kubeadm_join_control_plane is succeeded

View File

@@ -110,16 +110,7 @@
--config={{ kube_config_dir }}/kubeadm-config.yaml
--ignore-preflight-errors=all
--skip-phases=addon/coredns
{% if kubeadm_version is version('v1.14.0', '>=') %}
{% if kubeadm_version is version('v1.15.0', '<') %}
--experimental-upload-certs
{% if kubeadm_certificate_key is defined and kubeadm_version is version('v1.15.0', '<') %}
--certificate-key={{ kubeadm_certificate_key }}
{% endif %}
{% else %}
--upload-certs
{% endif %}
{% endif %}
register: kubeadm_init
# Retry is because upload config sometimes fails
retries: 3
@@ -135,7 +126,6 @@
kubeadm_certificate_key: "{{ item | regex_search('--certificate-key ([^ ]+)','\\1') | first }}"
with_items: "{{ hostvars[groups['kube-master'][0]]['kubeadm_init'].stdout_lines | default([]) }}"
when:
- kubeadm_version is version('v1.14.0', '>=')
- kubeadm_certificate_key is not defined
- item | trim | match('.*--certificate-key .*')

View File

@@ -3,11 +3,6 @@
command: "{{ bin_dir }}/kubeadm version -o short"
register: kubeadm_output
- name: sets kubeadm api version to v1beta1
set_fact:
kubeadmConfig_api_version: v1beta1
when: kubeadm_output.stdout is version('v1.13.0', '>=')
- name: sets kubeadm api version to v1beta2
set_fact:
kubeadmConfig_api_version: v1beta2