Fix adding output of kubeadm to the admin.conf downloaded to the artifacts directory (#4696)

Fixes issue https://github.com/kubernetes-sigs/kubespray/issues/4695
This commit is contained in:
Dmitri Rubinstein 2019-05-06 12:29:36 +02:00 committed by Kubernetes Prow Robot
parent d5c0829d61
commit 03bded2b6b

View file

@ -66,7 +66,7 @@
--apiserver-advertise-address {{ external_apiserver_address }} --apiserver-advertise-address {{ external_apiserver_address }}
--apiserver-bind-port {{ external_apiserver_port }} --apiserver-bind-port {{ external_apiserver_port }}
{% if kubeadm_version is version('v1.14.0', '>=') %} {% if kubeadm_version is version('v1.14.0', '>=') %}
&& cat {{ kube_config_dir }}/external_kubeconfig/admin.conf && >/dev/null && cat {{ kube_config_dir }}/external_kubeconfig/admin.conf &&
rm -rf {{ kube_config_dir }}/external_kubeconfig rm -rf {{ kube_config_dir }}/external_kubeconfig
{% endif %} {% endif %}
environment: "{{ proxy_env }}" environment: "{{ proxy_env }}"