Make (un)register -a work with garden kubeconfig paths with "~".

gardener-attic · Nov 7, 2018 · de05fe5 · de05fe5
1 parent 4d2ab01
commit de05fe5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/cmd/register.go b/cmd/register.go
@@ -17,6 +17,8 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"path/filepath"
+	"strings"
 
 	"github.com/badoux/checkmail"
 	"github.com/spf13/cobra"
@@ -85,7 +87,11 @@ var registerCmd = &cobra.Command{
 			var gardenConfig GardenConfig
 			GetGardenConfig(pathGardenConfig, &gardenConfig)
 			for _, cluster := range gardenConfig.GardenClusters {
-				config, err := clientcmd.BuildConfigFromFlags("", cluster.KubeConfig)
+				gardenKubeConfig := cluster.KubeConfig
+				if strings.Contains(gardenKubeConfig, "~") {
+					gardenKubeConfig = filepath.Clean(filepath.Join(HomeDir(), strings.Replace(gardenKubeConfig, "~", "", 1)))
+				}
+				config, err := clientcmd.BuildConfigFromFlags("", gardenKubeConfig)
 				checkError(err)
 				clientset, err := k8s.NewForConfig(config)
 				clusterRoleBinding, err := clientset.RbacV1().ClusterRoleBindings().Get("garden-administrators", metav1.GetOptions{})

diff --git a/cmd/unregister.go b/cmd/unregister.go
@@ -17,6 +17,8 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"path/filepath"
+	"strings"
 
 	"github.com/badoux/checkmail"
 	"github.com/spf13/cobra"
@@ -77,7 +79,11 @@ var unregisterCmd = &cobra.Command{
 			var gardenConfig GardenConfig
 			GetGardenConfig(pathGardenConfig, &gardenConfig)
 			for _, cluster := range gardenConfig.GardenClusters {
-				config, err := clientcmd.BuildConfigFromFlags("", cluster.KubeConfig)
+				gardenKubeConfig := cluster.KubeConfig
+				if strings.Contains(gardenKubeConfig, "~") {
+					gardenKubeConfig = filepath.Clean(filepath.Join(HomeDir(), strings.Replace(gardenKubeConfig, "~", "", 1)))
+				}
+				config, err := clientcmd.BuildConfigFromFlags("", gardenKubeConfig)
 				checkError(err)
 				clientset, err := k8s.NewForConfig(config)
 				checkError(err)