Get clusters states if a cluster was eksctl created

pkg/apis/eksctl.io/v1alpha5/assets/schema.json

@@ -384,6 +384,9 @@
           },
           "type": "array"
         },
+        "eksctlCreated": {
+          "type": "string"
+        },
         "endpoint": {
           "type": "string"
         },
@@ -395,7 +398,8 @@
         "endpoint",
         "certificateAuthorityData",
         "arn",
-        "stackName"
+        "stackName",
+        "eksctlCreated"
       ],
       "additionalProperties": false,
       "description": "hold read-only attributes of a cluster",

pkg/apis/eksctl.io/v1alpha5/types.go

@@ -472,6 +472,7 @@ type ClusterStatus struct {
 	CertificateAuthorityData []byte `json:"certificateAuthorityData,omitempty"`
 	ARN                      string `json:"arn,omitempty"`
 	StackName                string `json:"stackName,omitempty"`
+	EKSCTLCreated            string `json:"eksctlCreated,omitempty"`
 }
 
 // String returns canonical representation of ClusterMeta

pkg/ctl/get/cluster.go

@@ -2,6 +2,15 @@ package get
 
 import (
 	"fmt"
+	"os"
+	"strings"
+	"time"
+
+	awseks "github.com/aws/aws-sdk-go/service/eks"
+	"k8s.io/apimachinery/pkg/util/sets"
+
+	"github.com/weaveworks/eksctl/pkg/eks"
+	"github.com/weaveworks/eksctl/pkg/printers"
 
 	"github.com/kris-nova/logger"
 	"github.com/spf13/cobra"
@@ -65,5 +74,99 @@ func doGetCluster(cmd *cmdutils.Cmd, params *getCmdParams, listAllRegions bool)
 		return err
 	}
 
-	return ctl.ListClusters(cfg.Metadata.Name, params.chunkSize, params.output, listAllRegions)
+	if cfg.Metadata.Name == "" {
+		return getAndPrinterClusters(ctl, params, listAllRegions)
+	}
+
+	return getAndPrintCluster(cfg, ctl, params)
+}
+
+func getAndPrinterClusters(ctl *eks.ClusterProvider, params *getCmdParams, listAllRegions bool) error {
+
+	printer, err := printers.NewPrinter(params.output)
+	if err != nil {
+		return err
+	}
+
+	if params.output == "table" {
+		addGetClustersSummaryTableColumns(printer.(*printers.TablePrinter))
+	}
+
+	clusters, err := ctl.ListClusters(params.chunkSize, listAllRegions)
+	if err != nil {
+		return err
+	}
+
+	return printer.PrintObjWithKind("clusters", clusters, os.Stdout)
+}
+
+func addGetClustersSummaryTableColumns(printer *printers.TablePrinter) {
+	printer.AddColumn("NAME", func(c *api.ClusterConfig) string {
+		return c.Metadata.Name
+	})
+	printer.AddColumn("REGION", func(c *api.ClusterConfig) string {
+		return c.Metadata.Region
+	})
+	printer.AddColumn("EKSCTL CREATED", func(c *api.ClusterConfig) string {
+		return c.Status.EKSCTLCreated
+	})
+}
+
+func getAndPrintCluster(cfg *api.ClusterConfig, ctl *eks.ClusterProvider, params *getCmdParams) error {
+	printer, err := printers.NewPrinter(params.output)
+	if err != nil {
+		return err
+	}
+
+	if params.output == "table" {
+		addGetClusterSummaryTableColumns(printer.(*printers.TablePrinter))
+	}
+
+	cluster, err := ctl.GetCluster(cfg.Metadata.Name)
+
+	if err != nil {
+		return err
+	}
+
+	if err := printer.PrintObjWithKind("clusters", []*awseks.Cluster{cluster}, os.Stdout); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func addGetClusterSummaryTableColumns(printer *printers.TablePrinter) {
+	printer.AddColumn("NAME", func(c *awseks.Cluster) string {
+		return *c.Name
+	})
+	printer.AddColumn("VERSION", func(c *awseks.Cluster) string {
+		return *c.Version
+	})
+	printer.AddColumn("STATUS", func(c *awseks.Cluster) string {
+		return *c.Status
+	})
+	printer.AddColumn("CREATED", func(c *awseks.Cluster) string {
+		return c.CreatedAt.Format(time.RFC3339)
+	})
+	printer.AddColumn("VPC", func(c *awseks.Cluster) string {
+		return *c.ResourcesVpcConfig.VpcId
+	})
+	printer.AddColumn("SUBNETS", func(c *awseks.Cluster) string {
+		subnets := sets.NewString()
+		for _, subnetid := range c.ResourcesVpcConfig.SubnetIds {
+			if api.IsSetAndNonEmptyString(subnetid) {
+				subnets.Insert(*subnetid)
+			}
+		}
+		return strings.Join(subnets.List(), ",")
+	})
+	printer.AddColumn("SECURITYGROUPS", func(c *awseks.Cluster) string {
+		groups := sets.NewString()
+		for _, sg := range c.ResourcesVpcConfig.SecurityGroupIds {
+			if api.IsSetAndNonEmptyString(sg) {
+				groups.Insert(*sg)
+			}
+		}
+		return strings.Join(groups.List(), ",")
+	})
 }

pkg/eks/eks.go

@@ -3,12 +3,12 @@ package eks
 import (
 	"encoding/base64"
 	"fmt"
-	"os"
 	"regexp"
 	"strconv"
-	"strings"
 	"time"
 
+	"github.com/weaveworks/eksctl/pkg/cfn/manager"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/arn"
 	"github.com/aws/aws-sdk-go/aws/awserr"
@@ -17,7 +17,6 @@ import (
 
 	awseks "github.com/aws/aws-sdk-go/service/eks"
 
-	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/kubernetes"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
@@ -302,71 +301,57 @@ func (c *ClusterProvider) loadClusterKubernetesNetworkConfig(spec *api.ClusterCo
 }
 
 // ListClusters display details of all the EKS cluster in your account
-func (c *ClusterProvider) ListClusters(clusterName string, chunkSize int, output printers.Type, eachRegion bool) error {
-	// NOTE: this needs to be reworked in the future so that the functionality
-	// is combined. This require the ability to return details of all clusters
-	// in a single call.
-	printer, err := printers.NewPrinter(output)
-	if err != nil {
-		return err
-	}
-
-	if clusterName != "" {
-		if output == "table" {
-			addSummaryTableColumns(printer.(*printers.TablePrinter))
-		}
-		return c.doGetCluster(clusterName, printer)
-	}
-
-	if output == "table" {
-		addListTableColumns(printer.(*printers.TablePrinter))
-	}
-	allClusters := []*api.ClusterMeta{}
-	if err := c.doListClusters(int64(chunkSize), printer, &allClusters, eachRegion); err != nil {
-		return err
-	}
-	return printer.PrintObjWithKind("clusters", allClusters, os.Stdout)
-}
-
-func (c *ClusterProvider) getClustersRequest(chunkSize int64, nextToken string) ([]*string, *string, error) {
-	input := &awseks.ListClustersInput{MaxResults: &chunkSize}
-	if nextToken != "" {
-		input = input.SetNextToken(nextToken)
-	}
-	output, err := c.Provider.EKS().ListClusters(input)
-	if err != nil {
-		return nil, nil, errors.Wrap(err, "listing control planes")
-	}
-	return output.Clusters, output.NextToken, nil
-}
-
-func (c *ClusterProvider) doListClusters(chunkSize int64, printer printers.OutputPrinter, allClusters *[]*api.ClusterMeta, eachRegion bool) error {
-	if eachRegion {
+func (c *ClusterProvider) ListClusters(chunkSize int, listAllRegions bool) ([]*api.ClusterConfig, error) {
+	if listAllRegions {
+		var clusters []*api.ClusterConfig
 		// reset region and re-create the client, then make a recursive call
 		for _, region := range api.SupportedRegions() {
 			spec := &api.ProviderConfig{
 				Region:      region,
 				Profile:     c.Provider.Profile(),
 				WaitTimeout: c.Provider.WaitTimeout(),
 			}
-			if err := New(spec, nil).doListClusters(chunkSize, printer, allClusters, false); err != nil {
+			newClusters, err := New(spec, nil).doListClusters(int64(chunkSize))
+			if err != nil {
 				logger.Critical("error listing clusters in %q region: %s", region, err.Error())
 			}
+
+			clusters = append(clusters, newClusters...)
 		}
-		return nil
+		return clusters, nil
 	}
 
+	return c.doListClusters(int64(chunkSize))
+}
+
+func (c *ClusterProvider) doListClusters(chunkSize int64) ([]*api.ClusterConfig, error) {
+	var allClusters []*api.ClusterConfig
+
 	token := ""
 	for {
 		clusters, nextToken, err := c.getClustersRequest(chunkSize, token)
 		if err != nil {
-			return err
+			return nil, err
 		}
 
 		for _, clusterName := range clusters {
-			*allClusters = append(*allClusters, &api.ClusterMeta{
-				Name:   *clusterName,
-				Region: c.Provider.Region(),
+			spec := &api.ClusterConfig{Metadata: &api.ClusterMeta{Name: *clusterName}}
+			stacks, err := c.NewStackManager(spec).ListStacks()
+			managed := "False"
+			if err != nil {
+				managed = "Unknown"
+				logger.Warning("error fetching stacks for cluster %s: %v", clusterName, err)
+			} else if isClusterStack(stacks) {
+				managed = "True"
+			}
+			allClusters = append(allClusters, &api.ClusterConfig{
+				Metadata: &api.ClusterMeta{
+					Name:   *clusterName,
+					Region: c.Provider.Region(),
+				},
+				Status: &api.ClusterStatus{
+					EKSCTLCreated: managed,
+				},
 			})
 		}
 
@@ -377,37 +362,57 @@ func (c *ClusterProvider) doListClusters(chunkSize int64, printer printers.Outpu
 		}
 	}
 
-	return nil
+	return allClusters, nil
 }
 
-func (c *ClusterProvider) doGetCluster(clusterName string, printer printers.OutputPrinter) error {
+// GetCluster display details of an EKS cluster in your account
+func (c *ClusterProvider) GetCluster(clusterName string) (*awseks.Cluster, error) {
 	input := &awseks.DescribeClusterInput{
 		Name: &clusterName,
 	}
+
 	output, err := c.Provider.EKS().DescribeCluster(input)
 	if err != nil {
-		return errors.Wrapf(err, "unable to describe control plane %q", clusterName)
+		return nil, errors.Wrapf(err, "unable to describe control plane %q", clusterName)
 	}
 	logger.Debug("cluster = %#v", output)
 
-	clusters := []*awseks.Cluster{output.Cluster} // TODO: in the future this will have multiple clusters
-	if err := printer.PrintObjWithKind("clusters", clusters, os.Stdout); err != nil {
-		return err
-	}
-
 	if *output.Cluster.Status == awseks.ClusterStatusActive {
 		if logger.Level >= 4 {
 			spec := &api.ClusterConfig{Metadata: &api.ClusterMeta{Name: clusterName}}
 			stacks, err := c.NewStackManager(spec).ListStacks()
 			if err != nil {
-				return errors.Wrapf(err, "listing CloudFormation stack for %q", clusterName)
+				return &awseks.Cluster{}, errors.Wrapf(err, "listing CloudFormation stack for %q", clusterName)
 			}
 			for _, s := range stacks {
 				logger.Debug("stack = %#v", *s)
 			}
 		}
 	}
-	return nil
+	return output.Cluster, nil
+}
+
+func (c *ClusterProvider) getClustersRequest(chunkSize int64, nextToken string) ([]*string, *string, error) {
+	input := &awseks.ListClustersInput{MaxResults: &chunkSize}
+	if nextToken != "" {
+		input = input.SetNextToken(nextToken)
+	}
+	output, err := c.Provider.EKS().ListClusters(input)
+	if err != nil {
+		return nil, nil, errors.Wrap(err, "listing control planes")
+	}
+	return output.Clusters, output.NextToken, nil
+}
+
+func isClusterStack(stacks []*manager.Stack) bool {
+	for _, stack := range stacks {
+		for _, output := range stack.Outputs {
+			if *output.OutputKey == "ClusterStackName" {
+				return true
+			}
+		}
+	}
+	return false
 }
 
 // WaitForControlPlane waits till the control plane is ready
@@ -436,47 +441,14 @@ func (c *ClusterProvider) WaitForControlPlane(meta *api.ClusterMeta, clientSet *
 	}
 }
 
-func addSummaryTableColumns(printer *printers.TablePrinter) {
-	printer.AddColumn("NAME", func(c *awseks.Cluster) string {
-		return *c.Name
-	})
-	printer.AddColumn("VERSION", func(c *awseks.Cluster) string {
-		return *c.Version
-	})
-	printer.AddColumn("STATUS", func(c *awseks.Cluster) string {
-		return *c.Status
-	})
-	printer.AddColumn("CREATED", func(c *awseks.Cluster) string {
-		return c.CreatedAt.Format(time.RFC3339)
-	})
-	printer.AddColumn("VPC", func(c *awseks.Cluster) string {
-		return *c.ResourcesVpcConfig.VpcId
-	})
-	printer.AddColumn("SUBNETS", func(c *awseks.Cluster) string {
-		subnets := sets.NewString()
-		for _, subnetid := range c.ResourcesVpcConfig.SubnetIds {
-			if api.IsSetAndNonEmptyString(subnetid) {
-				subnets.Insert(*subnetid)
-			}
-		}
-		return strings.Join(subnets.List(), ",")
-	})
-	printer.AddColumn("SECURITYGROUPS", func(c *awseks.Cluster) string {
-		groups := sets.NewString()
-		for _, sg := range c.ResourcesVpcConfig.SecurityGroupIds {
-			if api.IsSetAndNonEmptyString(sg) {
-				groups.Insert(*sg)
-			}
-		}
-		return strings.Join(groups.List(), ",")
-	})
-}
-
 func addListTableColumns(printer *printers.TablePrinter) {
-	printer.AddColumn("NAME", func(c *api.ClusterMeta) string {
-		return c.Name
+	printer.AddColumn("NAME", func(c *api.ClusterConfig) string {
+		return c.Metadata.Name
+	})
+	printer.AddColumn("REGION", func(c *api.ClusterConfig) string {
+		return c.Metadata.Region
 	})
-	printer.AddColumn("REGION", func(c *api.ClusterMeta) string {
-		return c.Region
+	printer.AddColumn("EKSCTL CREATED", func(c *api.ClusterConfig) string {
+		return c.Status.EKSCTLCreated
 	})
 }