Merge pull request #4718 from lystor/bug-4695
Fix adding output of kubeadm to the admin.conf downloaded to the arti…
This commit is contained in:
commit
0d1a34ee6b
|
@ -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 }}"
|
||||||
|
|
Loading…
Reference in a new issue