From 58126de3d9aa0412a135381f74c9af88de707fb7 Mon Sep 17 00:00:00 2001
From: nautikos1235 <4201782+nautikos1235@users.noreply.github.com>
Date: Fri, 19 Jul 2019 18:33:12 +0200
Subject: [PATCH] Fix certificate-key param for kubeadm init (#4789) (#4988)

* Fix certificate-key param for kubeadm init

* Fix yamllint error
---
 roles/kubernetes/master/tasks/kubeadm-setup.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/kubernetes/master/tasks/kubeadm-setup.yml b/roles/kubernetes/master/tasks/kubeadm-setup.yml
index 24c91d1be..00718387a 100644
--- a/roles/kubernetes/master/tasks/kubeadm-setup.yml
+++ b/roles/kubernetes/master/tasks/kubeadm-setup.yml
@@ -105,13 +105,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