Merge branch 'master' into vmworld-fixes

neosab · web-flow · commit cbaf524fd1b2 · 2018-08-21T18:06:58.000-07:00
diff --git a/pkg/dispatchcli/cmd/install.go b/pkg/dispatchcli/cmd/install.go
@@ -987,7 +987,7 @@ func runInstall(out, errOut io.Writer, cmd *cobra.Command, args []string) error
 		if err != nil {
 			return errors.Wrapf(err, "Error installing docker-registry chart")
 		}
-		serviceName := fmt.Sprintf("%s-%s", config.DockerRegistry.Chart.Chart, config.DockerRegistry.Chart.Release)
+		serviceName := fmt.Sprintf("%s", config.DockerRegistry.Chart.Chart)
 		serviceIP, err := getK8sServiceClusterIP(serviceName, config.DockerRegistry.Chart.Namespace)
 		if err != nil {
 			return err

Original file line number	Diff line number	Diff line change
`@@ -987,7 +987,7 @@ func runInstall(out, errOut io.Writer, cmd *cobra.Command, args []string) error`
`987`	`987`	`if err != nil {`
`988`	`988`	`return errors.Wrapf(err, "Error installing docker-registry chart")`
`989`	`989`	`}`
`990`		`- serviceName := fmt.Sprintf("%s-%s", config.DockerRegistry.Chart.Chart, config.DockerRegistry.Chart.Release)`
	`990`	`+ serviceName := fmt.Sprintf("%s", config.DockerRegistry.Chart.Chart)`
`991`	`991`	`serviceIP, err := getK8sServiceClusterIP(serviceName, config.DockerRegistry.Chart.Namespace)`
`992`	`992`	`if err != nil {`
`993`	`993`	`return err`