From 8a808c4cc53256b33a177c4f0e48d8301dbffa59 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Wed, 10 Oct 2018 19:19:21 +0200 Subject: [PATCH] Set cluster config as early as possible --- cmd/up.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/cmd/up.go b/cmd/up.go index 62991894..8f3245e4 100644 --- a/cmd/up.go +++ b/cmd/up.go @@ -90,12 +90,21 @@ func ClusterUp( if err != nil { return APIURL, caCrt, clientCert, clientKey, nil, err } + if len(kubeCluster.ControlPlaneHosts) > 0 { + APIURL = fmt.Sprintf("https://" + kubeCluster.ControlPlaneHosts[0].Address + ":6443") + } + clientCert = string(cert.EncodeCertPEM(kubeCluster.Certificates[pki.KubeAdminCertName].Certificate)) + clientKey = string(cert.EncodePrivateKeyPEM(kubeCluster.Certificates[pki.KubeAdminCertName].Key)) + caCrt = string(cert.EncodeCertPEM(kubeCluster.Certificates[pki.CACertName].Certificate)) err = cluster.ReconcileCluster(ctx, kubeCluster, currentCluster, updateOnly) if err != nil { return APIURL, caCrt, clientCert, clientKey, nil, err } - + // update APIURL after reconcile + if len(kubeCluster.ControlPlaneHosts) > 0 { + APIURL = fmt.Sprintf("https://" + kubeCluster.ControlPlaneHosts[0].Address + ":6443") + } err = kubeCluster.SetUpHosts(ctx) if err != nil { return APIURL, caCrt, clientCert, clientKey, nil, err @@ -139,12 +148,6 @@ func ClusterUp( if err != nil { return APIURL, caCrt, clientCert, clientKey, nil, err } - if len(kubeCluster.ControlPlaneHosts) > 0 { - APIURL = fmt.Sprintf("https://" + kubeCluster.ControlPlaneHosts[0].Address + ":6443") - clientCert = string(cert.EncodeCertPEM(kubeCluster.Certificates[pki.KubeAdminCertName].Certificate)) - clientKey = string(cert.EncodePrivateKeyPEM(kubeCluster.Certificates[pki.KubeAdminCertName].Key)) - } - caCrt = string(cert.EncodeCertPEM(kubeCluster.Certificates[pki.CACertName].Certificate)) if err := checkAllIncluded(kubeCluster); err != nil { return APIURL, caCrt, clientCert, clientKey, nil, err