mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-05-13 04:17:39 -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:
committed by
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
|
||||
|
||||
Reference in New Issue
Block a user