custom helm chart url (#611)

Author: kinjalh

cmd/command/cd/cd.go

@@ -78,6 +78,7 @@ func Commands(clients client.Plural, helmConfiguration *action.Configuration) []
 				cli.StringFlag{Name: "url", Usage: "console url", Required: true},
 				cli.StringFlag{Name: "token", Usage: "deployment token", Required: true},
 				cli.StringFlag{Name: "values", Usage: "values file to use for the deployment agent helm chart", Required: false},
+				cli.StringFlag{Name: "chart-loc", Usage: "URL or filepath of helm chart tar file. Use if not wanting to install helm chart from default plural repository.", Required: false},
 				cli.BoolFlag{Name: "force", Usage: "ignore checking if the current cluster is correct"},
 			},
 		},
@@ -136,7 +137,7 @@ func (p *Plural) handleInstallDeploymentsOperator(c *cli.Context) error {
 	// we don't care if this fails to init as this command can be auth-less
 	_ = p.InitConsoleClient(consoleToken, consoleURL)
 
-	return p.DoInstallOperator(c.String("url"), c.String("token"), c.String("values"))
+	return p.DoInstallOperator(c.String("url"), c.String("token"), c.String("values"), c.String("chart-loc"))
 }
 
 func (p *Plural) handleUninstallOperator(_ *cli.Context) error {

cmd/command/cd/cd_clusters.go

@@ -98,6 +98,7 @@ func (p *Plural) cdClusterCommands() []cli.Command {
 				cli.StringFlag{Name: "name", Usage: "The name you'll give the cluster", Required: true},
 				cli.StringFlag{Name: "handle", Usage: "optional handle for the cluster"},
 				cli.StringFlag{Name: "values", Usage: "values file to use for the deployment agent helm chart", Required: false},
+				cli.StringFlag{Name: "chart-loc", Usage: "URL or filepath of helm chart tar file. Use if not wanting to install helm chart from default plural repository.", Required: false},
 				cli.StringFlag{Name: "project", Usage: "the project this cluster will belong to", Required: false},
 				cli.StringSliceFlag{
 					Name:  "tag",
@@ -110,6 +111,7 @@ func (p *Plural) cdClusterCommands() []cli.Command {
 			Action: common.LatestVersion(p.handleClusterReinstall),
 			Flags: []cli.Flag{
 				cli.StringFlag{Name: "values", Usage: "values file to use for the deployment agent helm chart", Required: false},
+				cli.StringFlag{Name: "chart-loc", Usage: "URL or filepath of helm chart tar file. Use if not wanting to install helm chart from default plural repository.", Required: false},
 			},
 			Usage:     "reinstalls the deployment operator into a cluster",
 			ArgsUsage: "@{cluster-handle}",
@@ -412,7 +414,7 @@ func (p *Plural) handleClusterReinstall(c *cli.Context) error {
 	}
 
 	id, name := common.GetIdAndName(handle)
-	return p.ReinstallOperator(c, id, name)
+	return p.ReinstallOperator(c, id, name, c.String("chart-loc"))
 }
 
 func (p *Plural) handleClusterBootstrap(c *cli.Context) error {
@@ -458,7 +460,7 @@ func (p *Plural) handleClusterBootstrap(c *cli.Context) error {
 			if attrs.Handle != nil {
 				handle = attrs.Handle
 			}
-			return p.ReinstallOperator(c, nil, handle)
+			return p.ReinstallOperator(c, nil, handle, c.String("chart-loc"))
 		}
 
 		return err
@@ -475,5 +477,5 @@ func (p *Plural) handleClusterBootstrap(c *cli.Context) error {
 
 	deployToken := *existing.CreateCluster.DeployToken
 	utils.Highlight("installing agent on %s with url %s\n", c.String("name"), p.ConsoleClient.Url())
-	return p.DoInstallOperator(url, deployToken, c.String("values"))
+	return p.DoInstallOperator(url, deployToken, c.String("values"), c.String("chart-loc"))
 }

cmd/command/edge/bootstrap.go

@@ -56,7 +56,7 @@ func (p *Plural) handleEdgeBootstrap(c *cli.Context) error {
 	if agentUrl, err := p.ConsoleClient.AgentUrl(cluster.CreateCluster.ID); err == nil {
 		url = agentUrl
 	}
-	return p.DoInstallOperator(url, *cluster.CreateCluster.DeployToken, "")
+	return p.DoInstallOperator(url, *cluster.CreateCluster.DeployToken, "", c.String("chart-loc"))
 }
 
 func (p *Plural) getClusterAttributes(registration *gqlclient.ClusterRegistrationFragment) (*gqlclient.ClusterAttributes, error) {

cmd/command/edge/edge.go

@@ -121,6 +121,11 @@ func Commands(clients client.Plural, helmConfiguration *action.Configuration) []
 					Usage:    "the unique id of the edge device on which this cluster runs",
 					Required: true,
 				},
+				cli.StringFlag{
+					Name:     "chart-loc",
+					Usage:    "URL or filepath of helm chart tar file. Use if not wanting to install helm chart from default plural repository.",
+					Required: false,
+				},
 			},
 		},
 	}

pkg/client/plural.go

@@ -196,7 +196,7 @@ func (p *Plural) HandleInit(c *cli.Context) error {
 	return nil
 }
 
-func (p *Plural) DoInstallOperator(url, token, values string) error {
+func (p *Plural) DoInstallOperator(url, token, values, chart_loc string) error {
 	err := p.InitKube()
 	if err != nil {
 		return err
@@ -237,14 +237,14 @@ func (p *Plural) DoInstallOperator(url, token, values string) error {
 		}
 	}
 	vals = algorithms.Merge(vals, globalVals)
-	err = console.InstallAgent(url, token, console.OperatorNamespace, version, vals)
+	err = console.InstallAgent(url, token, console.OperatorNamespace, version, chart_loc, vals)
 	if err == nil {
 		utils.Success("deployment operator installed successfully\n")
 	}
 	return err
 }
 
-func (p *Plural) ReinstallOperator(c *cli.Context, id, handle *string) error {
+func (p *Plural) ReinstallOperator(c *cli.Context, id, handle *string, chart_loc string) error {
 	deployToken, err := p.ConsoleClient.GetDeployToken(id, handle)
 	if err != nil {
 		return err
@@ -257,5 +257,5 @@ func (p *Plural) ReinstallOperator(c *cli.Context, id, handle *string) error {
 		}
 	}
 
-	return p.DoInstallOperator(url, deployToken, c.String("values"))
+	return p.DoInstallOperator(url, deployToken, c.String("values"), chart_loc)
 }

pkg/console/agent.go

@@ -42,27 +42,34 @@ func IsAlreadyAgentInstalled(k8sClient *kubernetes.Clientset) (bool, error) {
 	return false, nil
 }
 
-func InstallAgent(url, token, namespace, version string, values map[string]interface{}) error {
+func InstallAgent(url, token, namespace, version, helmChartLoc string, values map[string]interface{}) error {
 	settings := cli.New()
 	vals := map[string]interface{}{
 		"secrets":    map[string]string{"deployToken": token},
 		"consoleUrl": url,
 	}
 	vals = algorithms.Merge(vals, values)
 
-	if err := helm.AddRepo(ReleaseName, RepoUrl); err != nil {
-		return err
-	}
-
 	helmConfig, err := helm.GetActionConfig(namespace)
 	if err != nil {
 		return err
 	}
 
+	chartLoc := fmt.Sprintf("%s/%s", ReleaseName, ChartName)
+	if helmChartLoc == "" {
+		fmt.Println("Adding default Repo for deployment operator chart:", RepoUrl)
+		if err := helm.AddRepo(ReleaseName, RepoUrl); err != nil {
+			return err
+		}
+	} else {
+		fmt.Println("Using custom helm chart url:", chartLoc)
+		chartLoc = helmChartLoc
+	}
+
 	newInstallAction := action.NewInstall(helmConfig)
 	newInstallAction.ChartPathOptions.Version = version
 
-	cp, err := action.NewInstall(helmConfig).ChartPathOptions.LocateChart(fmt.Sprintf("%s/%s", ReleaseName, ChartName), settings)
+	cp, err := action.NewInstall(helmConfig).ChartPathOptions.LocateChart(chartLoc, settings)
 	if err != nil {
 		return err
 	}