Cr 9843 add rollouts (#353)

* updated go-sdk to 0.42.0
* updated autopilot to 0.3.5
* updated app-proxy to 1.1075.0
* use platform for `cluster list`

* updated version to 0.0.321

Author: ATGardner

CHANGELOG.md

@@ -1,3 +1,3 @@
 # Changelog:
 
-* Protect against invalid kube context
+* Added `cluster create-argo-rollouts` command

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.320
+VERSION=v0.0.321
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")

cmd/commands/cluster.go

@@ -18,12 +18,12 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"sort"
 	"strings"
 
 	"github.com/codefresh-io/cli-v2/pkg/log"
 	"github.com/codefresh-io/cli-v2/pkg/store"
 	"github.com/codefresh-io/cli-v2/pkg/util"
-	cdutil "github.com/codefresh-io/cli-v2/pkg/util/cd"
 	kustutil "github.com/codefresh-io/cli-v2/pkg/util/kust"
 
 	"github.com/Masterminds/semver/v3"
@@ -43,8 +43,14 @@ type (
 	}
 
 	ClusterRemoveOptions struct {
+		runtimeName string
 		server      string
+	}
+
+	ClusterCreateArgoRolloutsOptions struct {
 		runtimeName string
+		server      string
+		namespace   string
 	}
 )
 
@@ -63,21 +69,19 @@ func NewClusterCommand() *cobra.Command {
 		},
 	}
 
-	cmd.AddCommand(NewClusterAddCommand())
-	cmd.AddCommand(NewClusterRemoveCommand())
-	cmd.AddCommand(NewClusterListCommand())
+	cmd.AddCommand(newClusterAddCommand())
+	cmd.AddCommand(newClusterRemoveCommand())
+	cmd.AddCommand(newClusterListCommand())
+	cmd.AddCommand(newClusterCreateArgoRolloutsCommand())
 
 	return cmd
 }
 
-func NewClusterAddCommand() *cobra.Command {
-	var (
-		opts ClusterAddOptions
-		err  error
-	)
+func newClusterAddCommand() *cobra.Command {
+	var opts ClusterAddOptions
 
 	cmd := &cobra.Command{
-		Use:     "add RUNTIME_NAME",
+		Use:     "add [RUNTIME_NAME]",
 		Short:   "Add a cluster to a given runtime",
 		Args:    cobra.MaximumNArgs(1),
 		Example: util.Doc(`<BIN> cluster add my-runtime --context my-context`),
@@ -101,7 +105,6 @@ func NewClusterAddCommand() *cobra.Command {
 
 	cmd.Flags().BoolVar(&opts.dryRun, "dry-run", false, "")
 	opts.kubeFactory = kube.AddFlags(cmd.Flags())
-	die(err)
 
 	return cmd
 }
@@ -193,16 +196,14 @@ func createAddClusterKustomization(ingressUrl, contextName, server, csdpToken, v
 	return k
 }
 
-func NewClusterRemoveCommand() *cobra.Command {
-	var (
-		opts ClusterRemoveOptions
-	)
+func newClusterRemoveCommand() *cobra.Command {
+	var opts ClusterRemoveOptions
 
 	cmd := &cobra.Command{
-		Use:     "remove RUNTIME_NAME",
+		Use:     "remove [RUNTIME_NAME]",
 		Short:   "Removes a cluster from a given runtime",
 		Args:    cobra.MaximumNArgs(1),
-		Example: util.Doc(`<BIN> cluster remove my-runtime --server-url my-server-url`),
+		Example: util.Doc(`<BIN> cluster remove my-runtime --server-url https://<some-hash>.gr7.us-east-1.eks.amazonaws.com`),
 		PreRunE: func(cmd *cobra.Command, args []string) error {
 			var err error
 
@@ -232,7 +233,7 @@ func runClusterRemove(ctx context.Context, opts *ClusterRemoveOptions) error {
 		return err
 	}
 
-	err = appProxy.AppProxyClusters().RemoveCluster(ctx, opts.server, opts.runtimeName)
+	err = appProxy.AppProxyClusters().Delete(ctx, opts.server, opts.runtimeName)
 	if err != nil {
 		return fmt.Errorf("failed to remove cluster: %w", err)
 	}
@@ -242,70 +243,94 @@ func runClusterRemove(ctx context.Context, opts *ClusterRemoveOptions) error {
 	return nil
 }
 
-func NewClusterListCommand() *cobra.Command {
-	var runtimeName string
-	var kubeconfig string
+func newClusterListCommand() *cobra.Command {
+	runtimeName := ""
 
 	cmd := &cobra.Command{
-		Use:     "list RUNTIME_NAME",
+		Use:     "list [RUNTIME_NAME]",
 		Short:   "List all the clusters of a given runtime",
 		Args:    cobra.MaximumNArgs(1),
 		Example: util.Doc(`<BIN> cluster list my-runtime`),
-		PreRunE: func(cmd *cobra.Command, args []string) error {
-			var err error
-
-			runtimeName, err = ensureRuntimeName(cmd.Context(), args)
-			return err
+		PreRun: func(_ *cobra.Command, args []string) {
+			if len(args) == 1 {
+				runtimeName = args[0]
+			}
 		},
-		RunE: func(cmd *cobra.Command, _ []string) error {
-			return runClusterList(cmd.Context(), runtimeName, kubeconfig)
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return runClusterList(cmd.Context(), runtimeName)
 		},
 	}
 
-	cmd.Flags().StringVar(&kubeconfig, "kubeconfig", "", "Path to the kubeconfig file")
-
 	return cmd
 }
 
-func runClusterList(ctx context.Context, runtimeName, kubeconfig string) error {
-	runtime, err := cfConfig.NewClient().V2().Runtime().Get(ctx, runtimeName)
-	if err != nil {
-		return err
-	}
-
-	kubeContext, err := util.KubeContextNameByServer(*runtime.Cluster, kubeconfig)
-	if err != nil {
-		return fmt.Errorf("failed getting context for \"%s\": %w", *runtime.Cluster, err)
-	}
-
-	clusters, err := cdutil.GetClusterList(ctx, kubeContext, *runtime.Metadata.Namespace, false)
+func runClusterList(ctx context.Context, runtimeName string) error {
+	clusters, err := cfConfig.NewClient().V2().Cluster().List(ctx, runtimeName)
 	if err != nil {
 		return err
 	}
 
-	if len(clusters.Items) == 0 {
+	if len(clusters) == 0 {
 		log.G(ctx).Info("No clusters were found")
 		return nil
 	}
 
+	sort.SliceStable(clusters, func(i, j int) bool {
+		c1 := clusters[i]
+		if c1.Metadata.Name == "in-cluster" {
+			return true
+		}
+
+		c2 := clusters[j]
+		if c2.Metadata.Name == "in-cluster" {
+			return false
+		}
+
+		return c1.Metadata.Name < c2.Metadata.Name
+	})
+
 	tb := ansiterm.NewTabWriter(os.Stdout, 0, 0, 4, ' ', 0)
+	if runtimeName == "" {
+		_, err = fmt.Fprint(tb, "RUNTIME\t")
+		if err != nil {
+			return err
+		}
+	}
+
 	_, err = fmt.Fprintln(tb, "SERVER\tNAME\tVERSION\tSTATUS\tMESSAGE")
 	if err != nil {
 		return err
 	}
 
-	for _, c := range clusters.Items {
+	for _, c := range clusters {
 		server := c.Server
 		if len(c.Namespaces) > 0 {
 			server = fmt.Sprintf("%s (%d namespaces)", c.Server, len(c.Namespaces))
 		}
 
+		version := ""
+		if c.Info.ServerVersion != nil {
+			version = *c.Info.ServerVersion
+		}
+
+		message := ""
+		if c.Info.ConnectionState.Message != nil {
+			message = *c.Info.ConnectionState.Message
+		}
+
+		if runtimeName == "" {
+			_, err = fmt.Fprintf(tb, "%s\t", c.Metadata.Runtime)
+			if err != nil {
+				return err
+			}
+		}
+
 		_, err = fmt.Fprintf(tb, "%s\t%s\t%s\t%s\t%s\n",
 			server,
-			c.Name,
-			c.ServerVersion,
-			c.ConnectionState.Status,
-			c.ConnectionState.Message,
+			c.Metadata.Name,
+			version,
+			c.Info.ConnectionState.Status,
+			message,
 		)
 		if err != nil {
 			return err
@@ -314,3 +339,46 @@ func runClusterList(ctx context.Context, runtimeName, kubeconfig string) error {
 
 	return tb.Flush()
 }
+
+func newClusterCreateArgoRolloutsCommand() *cobra.Command {
+	var opts ClusterCreateArgoRolloutsOptions
+
+	cmd := &cobra.Command{
+		Use:     "create-argo-rollouts [RUNTIME_NAME]",
+		Short:   "creates argo-rollouts component on the target cluster",
+		Args:    cobra.MaximumNArgs(1),
+		Example: util.Doc(`<BIN> cluster create-argo-rollouts my-runtime --server-url https://<some-hash>.gr7.us-east-1.eks.amazonaws.com --namespace managed-ns`),
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			var err error
+
+			opts.runtimeName, err = ensureRuntimeName(cmd.Context(), args)
+			return err
+		},
+		RunE: func(cmd *cobra.Command, _ []string) error {
+			return runCreateArgoRollouts(cmd.Context(), &opts)
+		},
+	}
+
+	cmd.Flags().StringVar(&opts.server, "server-url", "", "The cluster's server url")
+	cmd.Flags().StringVar(&opts.namespace, "namespace", "", "Path to the kubeconfig file")
+	util.Die(cobra.MarkFlagRequired(cmd.Flags(), "server-url"))
+	util.Die(cobra.MarkFlagRequired(cmd.Flags(), "namespace"))
+
+	return cmd
+}
+
+func runCreateArgoRollouts(ctx context.Context, opts *ClusterCreateArgoRolloutsOptions) error {
+	appProxy, err := cfConfig.NewClient().AppProxy(ctx, opts.runtimeName, store.Get().InsecureIngressHost)
+	if err != nil {
+		return err
+	}
+
+	err = appProxy.AppProxyClusters().CreateArgoRollouts(ctx, opts.server, opts.namespace)
+	if err != nil {
+		return fmt.Errorf("failed to create argo-rollouts on \"%s'\": %w", opts.server, err)
+	} 
+
+	log.G(ctx).Infof("created argo-rollouts component on \"%s\"", opts.server)
+
+	return nil
+}

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.320/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.321/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.320/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.321/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

go.mod

@@ -4,13 +4,13 @@ go 1.18
 
 require (
 	github.com/Masterminds/semver/v3 v3.1.1
-	github.com/argoproj-labs/argocd-autopilot v0.3.0
+	github.com/argoproj-labs/argocd-autopilot v0.3.5
 	github.com/argoproj/applicationset v0.4.1
-	github.com/argoproj/argo-cd/v2 v2.3.2
+	github.com/argoproj/argo-cd/v2 v2.3.3
 	github.com/argoproj/argo-events v0.17.1-0.20220327045437-70eaafe9afec
 	github.com/argoproj/argo-workflows/v3 v3.3.1
 	github.com/briandowns/spinner v1.18.1
-	github.com/codefresh-io/go-sdk v0.41.1
+	github.com/codefresh-io/go-sdk v0.42.0
 	github.com/fatih/color v1.13.0
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/go-git/go-billy/v5 v5.3.1
@@ -32,8 +32,8 @@ require (
 	k8s.io/api v0.23.3
 	k8s.io/apimachinery v0.23.3
 	k8s.io/client-go v11.0.1-0.20190816222228-6d55c1b1f1ca+incompatible
-	sigs.k8s.io/kustomize/api v0.11.2
-	sigs.k8s.io/kustomize/kyaml v0.13.3
+	sigs.k8s.io/kustomize/api v0.11.4
+	sigs.k8s.io/kustomize/kyaml v0.13.6
 )
 
 require (
@@ -61,8 +61,8 @@ require (
 	github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
 	github.com/alicebob/miniredis/v2 v2.14.2 // indirect
 	github.com/antonmedv/expr v1.9.0 // indirect
-	github.com/argoproj/gitops-engine v0.6.1 // indirect
-	github.com/argoproj/notifications-engine v0.3.1-0.20220127183449-91deed20b998 // indirect
+	github.com/argoproj/gitops-engine v0.6.2 // indirect
+	github.com/argoproj/notifications-engine v0.3.1-0.20220322174744-ac18ca10234c // indirect
 	github.com/argoproj/pkg v0.11.1-0.20211203175135-36c59d8fafe0 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
 	github.com/beorn7/perks v1.0.1 // indirect