d8dfun/virtual-kubelet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fargate: Improve cluster API failure handling

Browse Source
This commit is contained in:
Onur Filiz
2018-07-04 20:44:24 -07:00
committed by Onur Filiz
parent 06ef7afecf
commit 5d39a2c292
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
providers/aws/fargate/cluster.go
View File

@@ -13,6 +13,10 @@ import (
k8sTypes "k8s.io/apimachinery/pkg/types" k8sTypes "k8s.io/apimachinery/pkg/types"
) )
const (
clusterFailureReasonMissing = "MISSING"
)
// ClusterConfig contains a Fargate cluster's configurable parameters. // ClusterConfig contains a Fargate cluster's configurable parameters.
type ClusterConfig struct { type ClusterConfig struct {
Region string Region string
@@ -83,7 +87,7 @@ func NewCluster(config *ClusterConfig) (*Cluster, error) {
// Check if the cluster already exists. // Check if the cluster already exists.
err = cluster.describe() err = cluster.describe()
if err != nil { if err != nil && !strings.Contains(err.Error(), clusterFailureReasonMissing) {
return nil, err return nil, err
} }
@@ -122,7 +126,7 @@ func (c *Cluster) create() error {
return err return err
} }
c.arn = *output.Cluster.ClusterArn c.arn = aws.StringValue(output.Cluster.ClusterArn)
log.Printf("Created Fargate cluster %s in region %s", c.name, c.region) log.Printf("Created Fargate cluster %s in region %s", c.name, c.region)
return nil return nil
@@ -139,18 +143,17 @@ func (c *Cluster) describe() error {
log.Printf("Looking for Fargate cluster %s in region %s.", c.name, c.region) log.Printf("Looking for Fargate cluster %s in region %s.", c.name, c.region)
output, err := api.DescribeClusters(input) output, err := api.DescribeClusters(input)
if err != nil || len(output.Clusters) > 1 { if err != nil || len(output.Clusters) == 0 {
if len(output.Failures) > 0 {
err = fmt.Errorf("reason: %s", *output.Failures[0].Reason)
}
err = fmt.Errorf("failed to describe cluster: %v", err) err = fmt.Errorf("failed to describe cluster: %v", err)
log.Println(err) log.Println(err)
return err return err
} }
if len(output.Clusters) == 0 { log.Printf("Found Fargate cluster %s in region %s.", c.name, c.region)
log.Printf("Fargate cluster %s in region %s does not exist.", c.name, c.region) c.arn = aws.StringValue(output.Clusters[0].ClusterArn)
} else {
log.Printf("Found Fargate cluster %s in region %s.", c.name, c.region)
c.arn = *output.Clusters[0].ClusterArn
}
return nil return nil
} }