1 files changed, 44 insertions, 14 deletions

diff --git a/clover/cloverctl/src/cloverctl/cmd/root.go b/clover/cloverctl/src/cloverctl/cmd/root.go
index 6878077..d1d9405 100644
--- a/clover/cloverctl/src/cloverctl/cmd/root.go
+++ b/clover/cloverctl/src/cloverctl/cmd/root.go
@@ -10,6 +10,7 @@ package cmd
 import (
     "fmt"
     "os"
+    "strings"
 
     homedir "github.com/mitchellh/go-homedir"
     "github.com/spf13/cobra"
@@ -18,7 +19,6 @@ import (
 )
 
 var cfgFile string
-
 var controllerIP string
 var cloverFile string
 
@@ -33,8 +33,9 @@ var rootCmd = &cobra.Command{
     //},
 }
 
-// Execute adds all child commands to the root command and sets flags appropriately.
-// This is called by main.main(). It only needs to happen once to the rootCmd.
+// Execute adds all child commands to the root command and sets flags
+// appropriately. This is called by main.main(). It only needs to happen
+// once to the rootCmd.
 func Execute() {
     if err := rootCmd.Execute(); err != nil {
         fmt.Println(err)
@@ -48,19 +49,12 @@ func init() {
     // Here you will define your flags and configuration settings.
     // Cobra supports persistent flags, which, if defined here,
     // will be global for your application.
-    rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.cloverctl.yaml)")
+    rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "",
+                              "config file (default is $HOME/.cloverctl.yaml)")
 
     // Cobra also supports local flags, which will only run
     // when this action is called directly.
     rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
-
-    cPort, cIP := cloverkube.GetServicesPortIP("clover-controller")
-    if cIP == "" {
-        controllerIP = "http://10.244.0.1:" + fmt.Sprint(cPort)
-    } else {
-        controllerIP = "http://" + cIP
-    }
-    fmt.Printf("\nclover-controller: %s %s\n", fmt.Sprint(cPort), cIP)
 }
 
 // initConfig reads in config file and ENV variables if set.
@@ -76,15 +70,51 @@ func initConfig() {
             os.Exit(1)
         }
 
-        // Search config in home directory with name ".cloverctl" (without extension).
+        // Search config in home directory with name ".cloverctl"
         viper.AddConfigPath(home)
         viper.SetConfigName(".cloverctl")
     }
 
     viper.AutomaticEnv() // read in environment variables that match
 
-    // If a config file is found, read it in.
+    cip_file := ""
+    // If a config file is found in home, read it in.
     if err := viper.ReadInConfig(); err == nil {
         fmt.Println("Using config file:", viper.ConfigFileUsed())
+        cip_file = viper.GetString("ControllerIP")
+    } else {
+        // Check for file in path from cloverctl
+        ep, err := os.Executable()
+        if err == nil {
+            exe_path := strings.Replace(ep, "cloverctl", "", -1)
+            viper.AddConfigPath(exe_path)
+            if err := viper.ReadInConfig(); err == nil {
+                fmt.Println("Using config file:", viper.ConfigFileUsed())
+                cip_file = viper.GetString("ControllerIP")
+            }
+        }
+    }
+
+    cPort, cip_kube := cloverkube.GetServicesPortIP("clover-controller")
+    // If IP in file
+    if cip_file != "" {
+        // Nodeport
+        controllerIP = "http://" + cip_file + ":" + fmt.Sprint(cPort)
+    }
+    // Override IP, if LB IP found
+    if cip_kube != "" {
+        fmt.Printf("IP %v", cip_kube)
+        controllerIP = "http://" + cip_kube
+    }
+}
+
+func checkControllerIP() {
+    // controllerIP exists
+    service := "clover-controller"
+    if controllerIP == "" {
+        fmt.Printf("%s address unspecified or cannot be found\n", service)
+        os.Exit(1)
+    } else {
+        fmt.Printf("%s address: %s\n", service, controllerIP)
     }
 }