From 1e470b047354c2767d22ca28c1c1d0fc81f34107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Kr=C3=BCger?= <ak@patientsky.com>
Date: Wed, 22 May 2019 11:06:11 +0200
Subject: [PATCH] Fix certificate-key param for kubeadm init (#4789)

* 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 510cbc6be..d9ee06f44 100644
--- 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