Skip to content

Commit

Permalink
Change logging for log.Fatal to fmt.Error
Browse files Browse the repository at this point in the history 
Signed-off-by: Drumil Patel <[email protected]>
  • Loading branch information
@weastel
weastel committed Aug 25, 2020
1 parent b91a414 commit 8adf862
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 33 deletions.
65 changes: 32 additions & 33 deletions pkg/provider/eks/eks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func (c *EKS) EKSDeploymentParse(*kingpin.ParseContext) error {

deploymentResource, err := provider.DeploymentsParse(c.DeploymentFiles, c.DeploymentVars)
if err != nil {
log.Fatalf("Couldn't parse deployment files: %v", err)
return fmt.Errorf("Couldn't parse deployment files: %v", err)
}

c.eksResources = deploymentResource
Expand All @@ -168,7 +168,7 @@ func (c *EKS) K8SDeploymentsParse(*kingpin.ParseContext) error {

deploymentResource, err := provider.DeploymentsParse(c.DeploymentFiles, c.DeploymentVars)
if err != nil {
log.Fatalf("Couldn't parse deployment files: %v", err)
return fmt.Errorf("Couldn't parse deployment files: %v", err)
}

for _, deployment := range deploymentResource {
Expand Down Expand Up @@ -205,42 +205,41 @@ func (c *EKS) ClusterCreate(*kingpin.ParseContext) error {
for _, deployment := range c.eksResources {

if err := yamlGo.UnmarshalStrict(deployment.Content, req); err != nil {
log.Fatalf("Error parsing the cluster deployment file %s:%v", deployment.FileName, err)
return fmt.Errorf("Error parsing the cluster deployment file %s:%v", deployment.FileName, err)
}

log.Printf("Cluster create request: name:'%s'", *req.Cluster.Name)
_, err := c.clientEKS.CreateCluster(&req.Cluster)
if err != nil {
log.Fatalf("Couldn't create cluster '%v', file:%v ,err: %v", *req.Cluster.Name, deployment.FileName, err)
return fmt.Errorf("Couldn't create cluster '%v', file:%v ,err: %v", *req.Cluster.Name, deployment.FileName, err)
}

err = provider.RetryUntilTrue(
fmt.Sprintf("creating cluster:%v", *req.Cluster.Name),
1000,
provider.EKSRetryCount,
func() (bool, error) { return c.clusterRunning(*req.Cluster.Name) },
)

if err != nil {
log.Fatalf("creating cluster err:%v", err)
return fmt.Errorf("creating cluster err:%v", err)
}

for _, nodegroupReq := range req.NodeGroups {
nodegroupReq.ClusterName = req.Cluster.Name
log.Printf("Nodegroup create request: NodeGroupName: '%s', ClusterName: '%s'", *nodegroupReq.NodegroupName, *req.Cluster.Name)
_, err := c.clientEKS.CreateNodegroup(&nodegroupReq)
if err != nil {
log.Fatalf("Couldn't create nodegroup '%v' for cluster '%v, file:%v ,err: %v", nodegroupReq.NodegroupName, req.Cluster.Name, deployment.FileName, err)
break
return fmt.Errorf("Couldn't create nodegroup '%v' for cluster '%v, file:%v ,err: %v", nodegroupReq.NodegroupName, req.Cluster.Name, deployment.FileName, err)
}

err = provider.RetryUntilTrue(
fmt.Sprintf("creating nodegroup:%s for cluster:%s", *nodegroupReq.NodegroupName, *req.Cluster.Name),
1000,
provider.EKSRetryCount,
func() (bool, error) { return c.nodeGroupCreated(*nodegroupReq.NodegroupName, *req.Cluster.Name) },
)

if err != nil {
log.Fatalf("creating nodegroup err:%v", err)
return fmt.Errorf("creating nodegroup err:%v", err)
}
}
}
Expand All @@ -253,7 +252,7 @@ func (c *EKS) ClusterDelete(*kingpin.ParseContext) error {
for _, deployment := range c.eksResources {

if err := yamlGo.UnmarshalStrict(deployment.Content, req); err != nil {
log.Fatalf("Error parsing the cluster deployment file %s:%v", deployment.FileName, err)
return fmt.Errorf("Error parsing the cluster deployment file %s:%v", deployment.FileName, err)
}

// To delete a cluster we have to manually delete all cluster
Expand All @@ -267,7 +266,7 @@ func (c *EKS) ClusterDelete(*kingpin.ParseContext) error {
for {
resL, err := c.clientEKS.ListNodegroups(reqL)
if err != nil {
log.Fatalf("listing nodepools err:%v", err)
return fmt.Errorf("listing nodepools err:%v", err)
}

for _, nodegroup := range resL.Nodegroups {
Expand All @@ -279,7 +278,7 @@ func (c *EKS) ClusterDelete(*kingpin.ParseContext) error {
}
_, err := c.clientEKS.DeleteNodegroup(&reqD)
if err != nil {
log.Fatalf("Couldn't create nodegroup '%v' for cluster '%v ,err: %v", *nodegroup, req.Cluster.Name, err)
return fmt.Errorf("Couldn't create nodegroup '%v' for cluster '%v ,err: %v", *nodegroup, req.Cluster.Name, err)
break
}

Expand All @@ -290,7 +289,7 @@ func (c *EKS) ClusterDelete(*kingpin.ParseContext) error {
)

if err != nil {
log.Fatalf("deleting nodegroup err:%v", err)
return fmt.Errorf("deleting nodegroup err:%v", err)
}
}

Expand All @@ -308,7 +307,7 @@ func (c *EKS) ClusterDelete(*kingpin.ParseContext) error {
log.Printf("Removing cluster '%v'", *reqD.Name)
_, err := c.clientEKS.DeleteCluster(reqD)
if err != nil {
log.Fatalf("Couldn't delete cluster '%v', file:%v ,err: %v", *req.Cluster.Name, deployment.FileName, err)
return fmt.Errorf("Couldn't delete cluster '%v', file:%v ,err: %v", *req.Cluster.Name, deployment.FileName, err)
}

err = provider.RetryUntilTrue(
Expand All @@ -317,7 +316,7 @@ func (c *EKS) ClusterDelete(*kingpin.ParseContext) error {
func() (bool, error) { return c.clusterDeleted(*reqD.Name) })

if err != nil {
log.Fatalf("removing cluster err:%v", err)
return fmt.Errorf("removing cluster err:%v", err)
}
}
return nil
Expand Down Expand Up @@ -367,15 +366,15 @@ func (c *EKS) NodeGroupCreate(*kingpin.ParseContext) error {
for _, deployment := range c.eksResources {

if err := yamlGo.UnmarshalStrict(deployment.Content, req); err != nil {
log.Fatalf("Error parsing the cluster deployment file %s:%v", deployment.FileName, err)
return fmt.Errorf("Error parsing the cluster deployment file %s:%v", deployment.FileName, err)
}

for _, nodegroupReq := range req.NodeGroups {
nodegroupReq.ClusterName = req.Cluster.Name
log.Printf("Nodegroup create request: NodeGroupName: '%s', ClusterName: '%s'", *nodegroupReq.NodegroupName, *req.Cluster.Name)
_, err := c.clientEKS.CreateNodegroup(&nodegroupReq)
if err != nil {
log.Fatalf("Couldn't create nodegroup '%s' for cluster '%s', file:%v ,err: %v", *nodegroupReq.NodegroupName, *req.Cluster.Name, deployment.FileName, err)
return fmt.Errorf("Couldn't create nodegroup '%s' for cluster '%s', file:%v ,err: %v", *nodegroupReq.NodegroupName, *req.Cluster.Name, deployment.FileName, err)
break
}

Expand All @@ -386,7 +385,7 @@ func (c *EKS) NodeGroupCreate(*kingpin.ParseContext) error {
)

if err != nil {
log.Fatalf("creating nodegroup err:%v", err)
return fmt.Errorf("creating nodegroup err:%v", err)
}
}
}
Expand All @@ -398,7 +397,7 @@ func (c *EKS) NodeGroupDelete(*kingpin.ParseContext) error {
req := &eksCluster{}
for _, deployment := range c.eksResources {
if err := yamlGo.UnmarshalStrict(deployment.Content, req); err != nil {
log.Fatalf("Error parsing the cluster deployment file %s:%v", deployment.FileName, err)
return fmt.Errorf("Error parsing the cluster deployment file %s:%v", deployment.FileName, err)
}

for _, nodegroupReq := range req.NodeGroups {
Expand All @@ -410,7 +409,7 @@ func (c *EKS) NodeGroupDelete(*kingpin.ParseContext) error {
}
_, err := c.clientEKS.DeleteNodegroup(&reqD)
if err != nil {
log.Fatalf("Couldn't delete nodegroup '%s' for cluster '%s, file:%v ,err: %v", *nodegroupReq.NodegroupName, *req.Cluster.Name, deployment.FileName, err)
return fmt.Errorf("Couldn't delete nodegroup '%s' for cluster '%s, file:%v ,err: %v", *nodegroupReq.NodegroupName, *req.Cluster.Name, deployment.FileName, err)
break
}
err = provider.RetryUntilTrue(
Expand All @@ -420,7 +419,7 @@ func (c *EKS) NodeGroupDelete(*kingpin.ParseContext) error {
)

if err != nil {
log.Fatalf("deleting nodegroup err:%v", err)
return fmt.Errorf("deleting nodegroup err:%v", err)
}

}
Expand Down Expand Up @@ -471,15 +470,15 @@ func (c *EKS) AllNodeGroupsRunning(*kingpin.ParseContext) error {
req := &eksCluster{}
for _, deployment := range c.eksResources {
if err := yamlGo.UnmarshalStrict(deployment.Content, req); err != nil {
log.Fatalf("Error parsing the cluster deployment file %s:%v", deployment.FileName, err)
return fmt.Errorf("Error parsing the cluster deployment file %s:%v", deployment.FileName, err)
}
for _, nodegroup := range req.NodeGroups {
isRunning, err := c.nodeGroupCreated(*nodegroup.NodegroupName, *req.Cluster.Name)
if err != nil {
log.Fatalf("error fetching nodegroup info")
return fmt.Errorf("error fetching nodegroup info")
}
if !isRunning {
log.Fatalf("nodepool not running name: %v", *nodegroup.NodegroupName)
return fmt.Errorf("nodepool not running name: %v", *nodegroup.NodegroupName)
}
}
}
Expand All @@ -491,15 +490,15 @@ func (c *EKS) AllNodeGroupsDeleted(*kingpin.ParseContext) error {
req := &eksCluster{}
for _, deployment := range c.eksResources {
if err := yamlGo.UnmarshalStrict(deployment.Content, req); err != nil {
log.Fatalf("Error parsing the cluster deployment file %s:%v", deployment.FileName, err)
return fmt.Errorf("Error parsing the cluster deployment file %s:%v", deployment.FileName, err)
}
for _, nodegroup := range req.NodeGroups {
isRunning, err := c.nodeGroupDeleted(*nodegroup.NodegroupName, *req.Cluster.Name)
if err != nil {
log.Fatalf("error fetching nodegroup info")
return fmt.Errorf("error fetching nodegroup info")
}
if !isRunning {
log.Fatalf("nodepool not running name: %v", *nodegroup.NodegroupName)
return fmt.Errorf("nodepool not running name: %v", *nodegroup.NodegroupName)
}
}
}
Expand All @@ -518,14 +517,14 @@ func (c *EKS) NewK8sProvider(*kingpin.ParseContext) error {

rep, err := c.clientEKS.DescribeCluster(req)
if err != nil {
log.Fatalf("failed to get cluster details: %v", err)
return fmt.Errorf("failed to get cluster details: %v", err)
}

arnRole := *rep.Cluster.Arn

caCert, err := base64.StdEncoding.DecodeString(*rep.Cluster.CertificateAuthority.Data)
if err != nil {
log.Fatalf("failed to decode certificate: %v", err.Error())
return fmt.Errorf("failed to decode certificate: %v", err.Error())
}

cluster := clientcmdapi.NewCluster()
Expand Down Expand Up @@ -553,7 +552,7 @@ func (c *EKS) NewK8sProvider(*kingpin.ParseContext) error {

c.k8sProvider, err = k8sProvider.New(c.ctx, config)
if err != nil {
log.Fatal("k8s provider error", err)
return fmt.Errorf("k8s provider error %v", err)
}

return nil
Expand All @@ -562,15 +561,15 @@ func (c *EKS) NewK8sProvider(*kingpin.ParseContext) error {
// ResourceApply calls k8s.ResourceApply to apply the k8s objects in the manifest files.
func (c *EKS) ResourceApply(*kingpin.ParseContext) error {
if err := c.k8sProvider.ResourceApply(c.k8sResources); err != nil {
log.Fatal("error while applying a resource err:", err)
return fmt.Errorf("error while applying a resource err: %v", err)
}
return nil
}

// ResourceDelete calls k8s.ResourceDelete to apply the k8s objects in the manifest files.
func (c *EKS) ResourceDelete(*kingpin.ParseContext) error {
if err := c.k8sProvider.ResourceDelete(c.k8sResources); err != nil {
log.Fatal("error while deleting objects from a manifest file err:", err)
return fmt.Errorf("error while deleting objects from a manifest file err: %v", err)
}
return nil
}
Expand Down
1 change: 1 addition & 0 deletions pkg/provider/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
)

const (
EKSRetryCount = 100
GlobalRetryCount = 50
Separator = "---"
globalRetryTime = 10 * time.Second
Expand Down

0 comments on commit 8adf862

Please sign in to comment.