mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-23 05:56:02 -03:30
Use K8s 1.14 and add kubeadm experimental control plane mode (#4514)
* Use K8s 1.14 and add kubeadm experimental control plane mode
This reverts commit d39c273d96.
* Cleanup kubeadm setup run on first master
* pin kubeadm_certificate_key in test
* Remove kubelet autolabel of kube-node, add symlink for pki dir
Change-Id: Id5e74dd667c60675dbfe4193b0bc9fb44380e1ca
This commit is contained in:
committed by
Kubernetes Prow Robot
parent
d0e628911c
commit
05dc2b3a09
@@ -40,18 +40,35 @@
|
||||
run_once: yes
|
||||
when: kubeconfig_localhost|default(false)
|
||||
|
||||
# NOTE(mattymo): Please forgive this workaround
|
||||
- name: Generate admin kubeconfig with external api endpoint
|
||||
shell: >-
|
||||
{{ bin_dir }}/kubeadm alpha
|
||||
{% if kubeadm_version is version('v1.13.0', '<') %}
|
||||
phase
|
||||
{% 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_config_dir }}/ssl
|
||||
--apiserver-advertise-address {{ external_apiserver_address }}
|
||||
--apiserver-bind-port {{ external_apiserver_port }}
|
||||
{% if kubeadm_version is version('v1.14.0', '>=') %}
|
||||
&& 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