Skip to content

Commit

Permalink
updated
Browse files Browse the repository at this point in the history
  • Loading branch information
@mirshahriar
mirshahriar committed May 9, 2023
1 parent 297bb6e commit 203a909
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
14 changes: 7 additions & 7 deletions internal/tools/aws/ec2.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,14 +205,14 @@ func (a *Client) CreateLaunchTemplate(data *model.LaunchTemplateData) error {
})
if err != nil {
if IsErrorCode(err, "InvalidLaunchTemplateName.AlreadyExistsException") {
a.logger.Debugf("LaunchTemplate %s already exists", data.Name)
a.logger.Debugf("Launch template %s already exists", data.Name)
return nil
}
return errors.Wrap(err, "failed to create EKS LaunchTemplate")
return errors.Wrap(err, "failed to create EKS launch template")
}

if launchTemplate == nil || launchTemplate.LaunchTemplate == nil {
return errors.New("failed to create EKS LaunchTemplate")
return errors.New("failed to create EKS launch template")
}

return nil
Expand Down Expand Up @@ -253,11 +253,11 @@ func (a *Client) UpdateLaunchTemplate(data *model.LaunchTemplateData) error {
if IsErrorCode(err, "InvalidLaunchTemplateName.NotFoundException") {
return a.CreateLaunchTemplate(data)
}
return errors.Wrap(err, "failed to create EKS LaunchTemplate version")
return errors.Wrap(err, "failed to create EKS launch template version")
}

if launchTemplate == nil || launchTemplate.LaunchTemplateVersion == nil {
return errors.New("failed to create ESK LaunchTemplate version")
return errors.New("failed to create ESK launch template version")
}

return nil
Expand All @@ -270,7 +270,7 @@ func (a *Client) DeleteLaunchTemplate(launchTemplateName string) error {
}

if launchTemplate == nil {
a.logger.Debugf("LaunchTemplate %s not found, assuming deleted", launchTemplateName)
a.logger.Debugf("Launch template %s not found, assuming deleted", launchTemplateName)
return nil
}

Expand All @@ -282,7 +282,7 @@ func (a *Client) DeleteLaunchTemplate(launchTemplateName string) error {
a.logger.Debugf("launch template %s not found, assuming deleted", launchTemplateName)
return nil
}
return errors.Wrap(err, "failed to delete EKS LaunchTemplate")
return errors.Wrap(err, "failed to delete EKS launch template")
}

return nil
Expand Down
42 changes: 21 additions & 21 deletions internal/tools/aws/eks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ func (a *Client) createEKSNodeGroup(cluster *model.Cluster, ngPrefix string) (*e

out, err := a.Service().eks.CreateNodegroup(context.TODO(), &nodeGroupReq)
if err != nil {
return nil, errors.Wrap(err, "failed to create EKS Nodegroup")
return nil, errors.Wrap(err, "failed to create EKS nodegroup")
}

return out.Nodegroup, nil
Expand All @@ -286,7 +286,7 @@ func (c *Client) getEKSNodeGroup(clusterName, nodegroupName string) (*eksTypes.N
})
if err != nil {
if !IsErrorResourceNotFound(err) {
return nil, errors.Wrap(err, "failed to describe EKS Nodegroup")
return nil, errors.Wrap(err, "failed to describe EKS nodegroup")
}
}

Expand All @@ -297,7 +297,7 @@ func (c *Client) getEKSNodeGroup(clusterName, nodegroupName string) (*eksTypes.N
return nil, nil
}

// EnsureEKSNodegroup ensures EKS Nodegroup is created.
// EnsureEKSNodegroup ensures EKS nodegroup is created.
func (c *Client) EnsureEKSNodegroup(cluster *model.Cluster, ngPrefix string) (*eksTypes.Nodegroup, error) {

clusterName := cluster.ProvisionerMetadataEKS.Name
Expand All @@ -312,7 +312,7 @@ func (c *Client) EnsureEKSNodegroup(cluster *model.Cluster, ngPrefix string) (*e

nodeGroup, err := c.getEKSNodeGroup(clusterName, ngChangeRequest.Name)
if err != nil {
return nil, errors.Wrapf(err, "failed to get an EKS Nodegroup %s", ngChangeRequest.Name)
return nil, errors.Wrapf(err, "failed to get an EKS nodegroup %s", ngChangeRequest.Name)
}

if nodeGroup != nil {
Expand All @@ -322,7 +322,7 @@ func (c *Client) EnsureEKSNodegroup(cluster *model.Cluster, ngPrefix string) (*e
return c.createEKSNodeGroup(cluster, ngPrefix)
}

// EnsureEKSNodegroupMigrated updates EKS Nodegroup.
// EnsureEKSNodegroupMigrated updates EKS nodegroup.
func (c *Client) EnsureEKSNodegroupMigrated(cluster *model.Cluster, ngPrefix string) error {
logger := c.logger.WithField("cluster", cluster.ID)

Expand All @@ -344,25 +344,25 @@ func (c *Client) EnsureEKSNodegroupMigrated(cluster *model.Cluster, ngPrefix str

_, err := c.createEKSNodeGroup(cluster, ngPrefix)
if err != nil {
return errors.Wrapf(err, "failed to create a new EKS Nodegroup %s", ngChangeRequest.Name)
return errors.Wrapf(err, "failed to create a new EKS nodegroup %s", ngChangeRequest.Name)
}

wait := 600 // seconds
logger.Infof("Waiting up to %d seconds for EKS Nodegroup %s to become active...", wait, ngChangeRequest.Name)
logger.Infof("Waiting up to %d seconds for EKS nodegroup %s to become active...", wait, ngChangeRequest.Name)

_, err = c.WaitForActiveEKSNodegroup(eksMetadata.Name, ngChangeRequest.Name, wait)
if err != nil {
return err
}

logger.Debugf("Deleting the old EKS Nodegroup %s", oldNodeGroupName)
logger.Debugf("Deleting the old EKS nodegroup %s", oldNodeGroupName)

err = c.EnsureEKSNodegroupDeleted(clusterName, oldNodeGroupName)
if err != nil {
return errors.Wrapf(err, "failed to delete the old EKS Nodegroup %s", oldNodeGroupName)
return errors.Wrapf(err, "failed to delete the old EKS nodegroup %s", oldNodeGroupName)
}

logger.Infof("Waiting up to %d seconds for EKS Nodegroup %s to be deleted...", wait, oldNodeGroupName)
logger.Infof("Waiting up to %d seconds for EKS nodegroup %s to be deleted...", wait, oldNodeGroupName)
err = c.WaitForEKSNodegroupToBeDeleted(eksMetadata.Name, oldNodeGroupName, wait)
if err != nil {
return err
Expand Down Expand Up @@ -403,15 +403,15 @@ func (a *Client) EnsureEKSClusterDeleted(clusterName string) error {
return nil
}

// EnsureEKSNodegroupDeleted ensures EKS Nodegroup is deleted.
// EnsureEKSNodegroupDeleted ensures EKS nodegroup is deleted.
func (a *Client) EnsureEKSNodegroupDeleted(clusterName, nodegroupName string) error {
if nodegroupName == "" {
return nil
}

nodeGroup, err := a.getEKSNodeGroup(clusterName, nodegroupName)
if err != nil {
return errors.Wrap(err, "failed to get EKS Nodegroup")
return errors.Wrap(err, "failed to get EKS nodegroup")
}

if nodeGroup == nil {
Expand All @@ -423,15 +423,15 @@ func (a *Client) EnsureEKSNodegroupDeleted(clusterName, nodegroupName string) er
}

if nodeGroup.Status == eksTypes.NodegroupStatusDeleteFailed {
return errors.Wrapf(err, "failed to delete EKS Nodegroup %s", nodegroupName)
return errors.Wrapf(err, "failed to delete EKS nodegroup %s", nodegroupName)
}

_, err = a.Service().eks.DeleteNodegroup(context.TODO(), &eks.DeleteNodegroupInput{
ClusterName: aws.String(clusterName),
NodegroupName: nodeGroup.NodegroupName,
})
if err != nil {
return errors.Wrap(err, "failed to delete EKS Nodegroup")
return errors.Wrap(err, "failed to delete EKS nodegroup")
}

return nil
Expand Down Expand Up @@ -459,19 +459,19 @@ func (c *Client) GetActiveEKSCluster(clusterName string) (*eksTypes.Cluster, err
return nil, nil
}

// GetActiveEKSNodegroup returns the EKS Nodegroup if active.
// GetActiveEKSNodegroup returns the EKS nodegroup if active.
func (c *Client) GetActiveEKSNodegroup(clusterName, workerName string) (*eksTypes.Nodegroup, error) {
nodeGroup, err := c.getEKSNodeGroup(clusterName, workerName)
if err != nil {
return nil, errors.Wrap(err, "failed to get EKS Nodegroup")
return nil, errors.Wrap(err, "failed to get EKS nodegroup")
}

if nodeGroup == nil {
return nil, nil
}

if nodeGroup.Status == eksTypes.NodegroupStatusCreateFailed {
return nil, errors.New("failed to create EKS Nodegroup")
return nil, errors.New("failed to create EKS nodegroup")
}

if nodeGroup.Status == eksTypes.NodegroupStatusActive {
Expand Down Expand Up @@ -513,11 +513,11 @@ func (c *Client) WaitForActiveEKSNodegroup(clusterName, nodeGroupName string, ti
for {
select {
case <-timeoutTimer.C:
return nil, errors.New("timed out waiting for EKS Nodegroup to become active")
return nil, errors.New("timed out waiting for EKS nodegroup to become active")
case <-tick.C:
nodeGroup, err := c.GetActiveEKSNodegroup(clusterName, nodeGroupName)
if err != nil {
return nil, errors.Wrap(err, "failed to check if EKS Nodegroup is active")
return nil, errors.Wrap(err, "failed to check if EKS nodegroup is active")
}
if nodeGroup != nil {
return nodeGroup, nil
Expand All @@ -535,11 +535,11 @@ func (c *Client) WaitForEKSNodegroupToBeDeleted(clusterName, workerName string,
for {
select {
case <-timeoutTimer.C:
return errors.New("timed out waiting for EKS Nodegroup to be deleted")
return errors.New("timed out waiting for EKS nodegroup to be deleted")
case <-tick.C:
nodeGroup, err := c.getEKSNodeGroup(clusterName, workerName)
if err != nil {
return errors.Wrap(err, "failed to describe EKS Nodegroup")
return errors.Wrap(err, "failed to describe EKS nodegroup")
}
if nodeGroup == nil {
return nil
Expand Down

0 comments on commit 203a909

Please sign in to comment.