Fix certificate-key param for kubeadm init (#4789)

* Fix certificate-key param for kubeadm init * Fix yamllint error
2019-05-22 11:06:11 +02:00 · 2019-05-22 11:06:11 +02:00 · 1e470b0473
parent 0ef3a7914c
commit 1e470b0473
1 changed files with 2 additions and 2 deletions
--- a/roles/kubernetes/master/tasks/kubeadm-setup.yml
+++ b/roles/kubernetes/master/tasks/kubeadm-setup.yml
@ -106,13 +106,13 @@
    {{ bin_dir }}/kubeadm init
    --config={{ kube_config_dir }}/kubeadm-config.yaml
    --ignore-preflight-errors=all
+    --skip-phases=addon/coredns
    {% if kubeadm_version is version('v1.14.0', '>=') %}
    --experimental-upload-certs
-    {% endif %}
-    --skip-phases=addon/coredns
    {% if kubeadm_certificate_key is defined %}
    --certificate-key={{ kubeadm_certificate_key }}
    {% endif %}
+    {% endif %}
  register: kubeadm_init
  # Retry is because upload config sometimes fails
  retries: 3