diff options
author | earrage <eddie.arrage@huawei.com> | 2018-11-05 11:49:36 -0800 |
---|---|---|
committer | earrage <eddie.arrage@huawei.com> | 2018-11-05 16:24:29 -0800 |
commit | 265bdb46e6875cb5c75e6db8e98a38775da69391 (patch) | |
tree | 526c69d2af7ca2538a0bb6ca86b0fdd062d844a2 /clover/cloverctl/src/cloverctl/cmd/get_docker_registry.go | |
parent | ad43226c30daec6b5d4a1379650994427361a3f8 (diff) |
Add ability to read controller nodeport IP from file
- Formalize use of cloverctl config file using viper
- Default name of config file is '.cloverctl.yaml'
- Look for file in home directory or relative to
cloverctl executable
- Single value in config is for 'ControllerIP: <IP Address>'
- Still try and retrieve port value of clover-controller nodeport
automatically
- Still try and retrieve IP address of clover-controller LB if
GKE environment is being used and override config file value if found
in current kube context
- Improve error messaging if controller connect fails
- Clean up the CLI help output
- Modify jmeter 'get testresult' command to avoid the use
of flags and use arguments instead
Change-Id: Id95d1b3d1079ac84996681db62da1f9b6b8a88b5
Signed-off-by: earrage <eddie.arrage@huawei.com>
Diffstat (limited to 'clover/cloverctl/src/cloverctl/cmd/get_docker_registry.go')
-rw-r--r-- | clover/cloverctl/src/cloverctl/cmd/get_docker_registry.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/clover/cloverctl/src/cloverctl/cmd/get_docker_registry.go b/clover/cloverctl/src/cloverctl/cmd/get_docker_registry.go index 93c1b3e..7ae94c9 100644 --- a/clover/cloverctl/src/cloverctl/cmd/get_docker_registry.go +++ b/clover/cloverctl/src/cloverctl/cmd/get_docker_registry.go @@ -11,7 +11,7 @@ import ( "fmt" "strings" "encoding/json" - + "os" "gopkg.in/resty.v1" "github.com/spf13/cobra" ) @@ -31,6 +31,7 @@ func init() { } func getdocker() { + checkControllerIP() url := controllerIP + "/halyard/account" var provider = map[string]string{"name": "dockerRegistry"} @@ -44,7 +45,8 @@ func getdocker() { SetBody(out_json). Get(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } if resp.StatusCode() != 200 { fmt.Printf("\n%v\n", resp) |