From 9cd00977e97e25ebd778c0b798bef682c6dd9c05 Mon Sep 17 00:00:00 2001
From: Emeline Gaulard <emeline.gaulard@gmail.com>
Date: Fri, 18 May 2018 17:54:47 +0200
Subject: [PATCH] expand home directory

---
 cmd/opts.go              | 7 +++++++
 pkg/populator/generic.go | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/cmd/opts.go b/cmd/opts.go
index f234d5b95..f48d8a78c 100755
--- a/cmd/opts.go
+++ b/cmd/opts.go
@@ -84,6 +84,13 @@ func NewDeps(logs svc.Logger, kopts KubeOpts) (*Deps, error) {
 		kopts.KubeConfig = filepath.Join(hdir, ".kube", "config")
 	}
 
+	var err error
+	kopts.KubeConfig, err = homedir.Expand(kopts.KubeConfig)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to expand home directory in kube config file path")
+	}
+	//Normalize all slashes to native platform slashes (e.g. / to \ on Windows)
+	kopts.KubeConfig = filepath.FromSlash(kopts.KubeConfig)
 	kcfg, err := clientcmd.BuildConfigFromFlags("", kopts.KubeConfig)
 	if err != nil {
 		if os.IsNotExist(err) {
diff --git a/pkg/populator/generic.go b/pkg/populator/generic.go
index ea0a0c49c..9886bdc5d 100644
--- a/pkg/populator/generic.go
+++ b/pkg/populator/generic.go
@@ -69,7 +69,11 @@ func (o *GenericPopulator) PopulateKubeConfig(namespace string) error {
 	if o.cluster.CaCertificate == "" {
 		c.InsecureSkipTLSVerify = true
 	} else {
-		c.CertificateAuthorityData = []byte(o.cluster.CaCertificate)
+		data, err := base64.StdEncoding.DecodeString(o.cluster.CaCertificate)
+		if err != nil {
+			return err
+		}
+		c.CertificateAuthorityData = data
 	}
 	c.Server = o.cluster.ServiceURL