mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-05-14 21:07:42 -02:30
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
committed by
Kubernetes Prow Robot
Kubernetes Prow Robot
parent
f16cc1f08d
commit
a43e0d3f95
@@ -49,32 +49,16 @@
|
||||
# NOTE(mattymo): Please forgive this workaround
|
||||
- name: Generate admin kubeconfig with external api endpoint
|
||||
shell: >-
|
||||
{% if kubeadm_version is version('v1.14.0', '>=') %}
|
||||
mkdir -p {{ kube_config_dir }}/external_kubeconfig &&
|
||||
{% endif %}
|
||||
{{ bin_dir }}/kubeadm
|
||||
{% if kubeadm_version is version('v1.14.0', '>=') %}
|
||||
init phase
|
||||
{% elif kubeadm_version is version('v1.13.0', '>=') %}
|
||||
alpha
|
||||
{% else %}
|
||||
alpha phase
|
||||
{% endif %}
|
||||
{% if kubeadm_version is version('v1.14.0', '>=') %}
|
||||
kubeconfig admin
|
||||
--kubeconfig-dir {{ kube_config_dir }}/external_kubeconfig
|
||||
{% else %}
|
||||
kubeconfig user
|
||||
--client-name kubernetes-admin
|
||||
--org system:masters
|
||||
{% endif %}
|
||||
--cert-dir {{ kube_cert_dir }}
|
||||
--apiserver-advertise-address {{ external_apiserver_address }}
|
||||
--apiserver-bind-port {{ external_apiserver_port }}
|
||||
{% if kubeadm_version is version('v1.14.0', '>=') %}
|
||||
>/dev/null && cat {{ kube_config_dir }}/external_kubeconfig/admin.conf &&
|
||||
rm -rf {{ kube_config_dir }}/external_kubeconfig
|
||||
{% endif %}
|
||||
environment: "{{ proxy_env }}"
|
||||
run_once: yes
|
||||
register: admin_kubeconfig
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 .*')
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -322,9 +322,7 @@ ipvs:
|
||||
minSyncPeriod: {{ kube_proxy_min_sync_period }}
|
||||
scheduler: {{ kube_proxy_scheduler }}
|
||||
syncPeriod: {{ kube_proxy_sync_period }}
|
||||
{% if kube_version is version('v1.14.2', '>=') %}
|
||||
strictARP: {{ kube_proxy_strict_arp }}
|
||||
{% endif %}
|
||||
metricsBindAddress: {{ kube_proxy_metrics_bind_address }}
|
||||
mode: {{ kube_proxy_mode }}
|
||||
nodePortAddresses: {{ kube_proxy_nodeport_addresses }}
|
||||
|
||||
@@ -324,9 +324,7 @@ ipvs:
|
||||
minSyncPeriod: {{ kube_proxy_min_sync_period }}
|
||||
scheduler: {{ kube_proxy_scheduler }}
|
||||
syncPeriod: {{ kube_proxy_sync_period }}
|
||||
{% if kube_version is version('v1.14.2', '>=') %}
|
||||
strictARP: {{ kube_proxy_strict_arp }}
|
||||
{% endif %}
|
||||
metricsBindAddress: {{ kube_proxy_metrics_bind_address }}
|
||||
mode: {{ kube_proxy_mode }}
|
||||
nodePortAddresses: {{ kube_proxy_nodeport_addresses }}
|
||||
|
||||
@@ -57,4 +57,4 @@
|
||||
enabled: yes
|
||||
state: started
|
||||
tags:
|
||||
- kubelet
|
||||
- kubelet
|
||||
|
||||
@@ -241,12 +241,6 @@
|
||||
when: resolvconf_mode is defined
|
||||
run_once: true
|
||||
|
||||
- name: Stop if k8s version is too low for kubeadm etcd mode
|
||||
assert:
|
||||
that: kube_version is version('v1.14.0', '>=')
|
||||
msg: "kubeadm etcd mode requires k8s version >= v1.14.0"
|
||||
when: etcd_kubeadm_enabled
|
||||
|
||||
- name: Stop if kubeadm etcd mode is enabled but experimental control plane is not
|
||||
assert:
|
||||
that: kubeadm_control_plane
|
||||
|
||||
Reference in New Issue
Block a user