feat: add clusterId helm value to the agent installation (#671)

* add clusterId helm value to the agent installation

* make cluster-id optional

Author: zreigz

cmd/command/cd/cd.go

@@ -78,6 +78,7 @@ func Commands(clients client.Plural, helmConfiguration *action.Configuration) []
 			Flags: []cli.Flag{
 				cli.StringFlag{Name: "url", Usage: "console url", Required: true},
 				cli.StringFlag{Name: "token", Usage: "deployment token", Required: true},
+				cli.StringFlag{Name: "cluster-id", Usage: "cluster id to install the operator for", Required: false},
 				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"},
@@ -125,22 +126,28 @@ func Commands(clients client.Plural, helmConfiguration *action.Configuration) []
 }
 
 func (p *Plural) handleInstallDeploymentsOperator(c *cli.Context) error {
+	cliClusterId := c.String("cluster-id")
 	if !c.Bool("force") {
-		confirm, err := confirmCluster(c.String("url"), c.String("token"))
+		confirm, clusterId, err := confirmCluster(c.String("url"), c.String("token"))
 		if err != nil {
 			return err
 		}
 		if !confirm {
 			return nil
 		}
+		cliClusterId = clusterId
+	}
+
+	if cliClusterId == "" {
+		return fmt.Errorf("cluster id must be provided")
 	}
 
 	// we don't care if this fails to init as this command can be auth-less
 	if err := p.InitConsoleClient(consoleToken, consoleURL); err != nil {
 		utils.Warn("Console client was not initialized, reason: %s", err.Error())
 	}
 
-	return p.DoInstallOperator(c.String("url"), c.String("token"), c.String("values"), c.String("chart-loc"))
+	return p.DoInstallOperator(c.String("url"), c.String("token"), c.String("values"), c.String("chart-loc"), cliClusterId)
 }
 
 func (p *Plural) handleUninstallOperator(_ *cli.Context) error {
@@ -151,20 +158,20 @@ func (p *Plural) handleUninstallOperator(_ *cli.Context) error {
 	return console.UninstallAgent(console.OperatorNamespace)
 }
 
-func confirmCluster(url, token string) (bool, error) {
+func confirmCluster(url, token string) (bool, string, error) {
 	consoleClient, err := console.NewConsoleClient(token, url)
 	if err != nil {
-		return false, err
+		return false, "", err
 	}
 
 	myCluster, err := consoleClient.MyCluster()
 	if err != nil {
-		return false, err
+		return false, "", err
 	}
 
 	clusterFragment, err := consoleClient.GetCluster(&myCluster.MyCluster.ID, nil)
 	if err != nil {
-		return false, err
+		return false, "", err
 	}
 
 	handle := "-"
@@ -175,7 +182,7 @@ func confirmCluster(url, token string) (bool, error) {
 	if clusterFragment.Distro != nil {
 		provider = string(*clusterFragment.Distro)
 	}
-	return common.Confirm(fmt.Sprintf("Are you sure you want to install deploy operator for the cluster:\nName: %s\nHandle: %s\nProvider: %s\n", myCluster.MyCluster.Name, handle, provider), "PLURAL_INSTALL_AGENT_CONFIRM"), nil
+	return common.Confirm(fmt.Sprintf("Are you sure you want to install deploy operator for the cluster:\nName: %s\nHandle: %s\nProvider: %s\n", myCluster.MyCluster.Name, handle, provider), "PLURAL_INSTALL_AGENT_CONFIRM"), myCluster.MyCluster.ID, nil
 }
 
 func (p *Plural) HandleCdLogin(c *cli.Context) (err error) {

cmd/command/cd/cd_clusters.go

@@ -536,7 +536,7 @@ 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"), c.String("chart-loc"))
+	return p.DoInstallOperator(url, deployToken, c.String("values"), c.String("chart-loc"), existing.CreateCluster.ID)
 }
 
 func getMetadataJson(val string) (*string, error) {

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, "", c.String("chart-loc"))
+	return p.DoInstallOperator(url, *cluster.CreateCluster.DeployToken, "", c.String("chart-loc"), cluster.CreateCluster.ID)
 }
 
 func (p *Plural) getClusterAttributes(registration *gqlclient.ClusterRegistrationFragment) (*gqlclient.ClusterAttributes, error) {

pkg/client/plural.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/pluralsh/plural-cli/pkg/utils/git"
 	"github.com/pluralsh/polly/algorithms"
+	"github.com/samber/lo"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 
 	"github.com/urfave/cli"
@@ -196,7 +197,7 @@ func (p *Plural) HandleInit(c *cli.Context) error {
 	return nil
 }
 
-func (p *Plural) DoInstallOperator(url, token, values, chart_loc string) error {
+func (p *Plural) DoInstallOperator(url, token, values, chart_loc, clusterId string) error {
 	err := p.InitKube()
 	if err != nil {
 		return err
@@ -249,7 +250,7 @@ func (p *Plural) DoInstallOperator(url, token, values, chart_loc string) error {
 		}
 	}
 	vals = algorithms.Merge(vals, globalVals)
-	err = console.InstallAgent(url, token, console.OperatorNamespace, version, chart_loc, vals)
+	err = console.InstallAgent(url, token, console.OperatorNamespace, version, chart_loc, clusterId, vals)
 	if err == nil {
 		utils.Success("Deployment operator installed successfully\n")
 	}
@@ -263,11 +264,13 @@ func (p *Plural) ReinstallOperator(c *cli.Context, id, handle *string, chart_loc
 	}
 
 	url := p.ConsoleClient.ExtUrl()
+	clusterId := lo.FromPtr(id)
 	if cluster, err := p.ConsoleClient.GetCluster(id, handle); err == nil {
+		clusterId = cluster.ID
 		if agentUrl, err := p.ConsoleClient.AgentUrl(cluster.ID); err == nil {
 			url = agentUrl
 		}
 	}
 
-	return p.DoInstallOperator(url, deployToken, c.String("values"), chart_loc)
+	return p.DoInstallOperator(url, deployToken, c.String("values"), chart_loc, clusterId)
 }

pkg/console/agent.go

@@ -90,10 +90,11 @@ func IsAlreadyAgentInstalled(k8sClient *kubernetes.Clientset) (bool, error) {
 	return false, nil
 }
 
-func InstallAgent(consoleURL, token, namespace, version, helmChartLoc string, values map[string]interface{}) error {
+func InstallAgent(consoleURL, token, namespace, version, helmChartLoc, clusterID string, values map[string]interface{}) error {
 	vals := algorithms.Merge(map[string]interface{}{
 		"secrets":    map[string]string{"deployToken": token},
 		"consoleUrl": consoleURL,
+		"clusterId":  clusterID,
 	}, values)
 
 	config, err := helm.GetActionConfig(namespace)

pkg/console/clusters.go

@@ -93,7 +93,7 @@ func (c *consoleClient) DetachCluster(id string) error {
 func (c *consoleClient) CreateCluster(attributes consoleclient.ClusterAttributes) (*consoleclient.CreateCluster, error) {
 	newCluster, err := c.client.CreateCluster(c.ctx, attributes)
 	if err != nil {
-		return nil, api.GetErrorResponse(err, "CreateCluster")
+		return nil, err
 	}
 	return newCluster, nil
 }