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/delete_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/delete_docker_registry.go')
-rw-r--r-- | clover/cloverctl/src/cloverctl/cmd/delete_docker_registry.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/clover/cloverctl/src/cloverctl/cmd/delete_docker_registry.go b/clover/cloverctl/src/cloverctl/cmd/delete_docker_registry.go index d4403a5..3bb411a 100644 --- a/clover/cloverctl/src/cloverctl/cmd/delete_docker_registry.go +++ b/clover/cloverctl/src/cloverctl/cmd/delete_docker_registry.go @@ -10,14 +10,14 @@ package cmd import ( "fmt" "encoding/json" - + "os" "gopkg.in/resty.v1" "github.com/spf13/cobra" ) var deldockerproviderCmd = &cobra.Command{ Use: "docker-registry", - Short: "delete one docker registry provider by name from spinnaker", + Short: "Delete one docker registry provider by name from spinnaker", Long: ``, Run: func(cmd *cobra.Command, args []string) { deldockerProvider() @@ -26,12 +26,14 @@ var deldockerproviderCmd = &cobra.Command{ func init() { providerdelCmd.AddCommand(deldockerproviderCmd) - deldockerproviderCmd.Flags().StringVarP(&name, "name", "n", "", "Input docker-registry account name") + deldockerproviderCmd.Flags().StringVarP(&name, "name", "n", "", + "Input docker-registry account name") deldockerproviderCmd.MarkFlagRequired("name") } func deldockerProvider() { + checkControllerIP() url := controllerIP + "/halyard/delprovider" var in = map[string]string{"name": name, "provider":"dockerRegistry"} @@ -45,7 +47,8 @@ func deldockerProvider() { SetBody(out_json). Post(url) if err != nil { - panic(err.Error()) + fmt.Printf("Cannot connect to controller: %v\n", err) + os.Exit(1) } fmt.Printf("\n%v\n", resp) |