Skip to content

Commit

Permalink
fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@mirshahriar
mirshahriar committed May 9, 2023
1 parent 203a909 commit 48324d6
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 29 deletions.
4 changes: 2 additions & 2 deletions clusterdictionary/size.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ func AddToCreateClusterRequest(sizes map[string]string, request *model.CreateClu
for ng, ngSize := range sizes {
ngType, minCount, maxCount, err := processCustomSize(ngSize)
if err != nil {
return errors.Wrapf(err, "invalid nodegroup size for %s", ng)
return err
}

request.AdditionalNodeGroups[ng] = model.NodeGroupMetadata{
Expand All @@ -211,7 +211,7 @@ func AddToCreateNodegroupsRequest(sizes map[string]string, request *model.Create
for ng, ngSize := range sizes {
ngType, minCount, maxCount, err := processCustomSize(ngSize)
if err != nil {
return errors.Wrapf(err, "invalid nodegroup size for %s", ng)
return err
}

request.Nodegroups[ng] = model.NodeGroupMetadata{
Expand Down
3 changes: 2 additions & 1 deletion internal/provisioner/eks_provisioner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,7 @@ func (provisioner *EKSProvisioner) ResizeCluster(cluster *model.Cluster) error {
oldMetadata.MinCount == ngMetadata.MinCount &&
oldMetadata.MaxCount == ngMetadata.MaxCount {
logger.Debugf("No change in EKS nodegroup for %s", ngPrefix)
return
}

err = provisioner.prepareLaunchTemplate(cluster, ngPrefix, ngMetadata, logger)
Expand Down Expand Up @@ -794,7 +795,7 @@ func (provisioner *EKSProvisioner) getKubeConfigPath(cluster *model.Cluster) (st
return "", errors.Wrap(err, "failed to get EKS cluster")
}
if eksCluster == nil {
return "", errors.Errorf("the EKS cluster %s does not exist", clusterName)
return "", errors.Errorf("No active EKS cluster found with name %s", clusterName)
}

kubeconfig, err := newEKSKubeConfig(eksCluster, provisioner.awsClient)
Expand Down
6 changes: 3 additions & 3 deletions internal/supervisor/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ func (s *ClusterSupervisor) refreshClusterMetadata(cluster *model.Cluster, logge

err = s.store.UpdateCluster(cluster)
if err != nil {
logger.WithError(err).Error("Failed to update cluster metadata in store")
logger.WithError(err).Error("Failed to update cluster metadata")
return model.ClusterStateRefreshMetadata
}

Expand Down Expand Up @@ -323,7 +323,7 @@ func (s *ClusterSupervisor) checkClusterCreated(cluster *model.Cluster, logger l
return model.ClusterStateCreationFailed
}
if !ready {
logger.Debug("Cluster is not yet ready")
logger.Debug("Cluster not yet ready")
return model.ClusterStateCreationInProgress
}

Expand All @@ -344,7 +344,7 @@ func (s *ClusterSupervisor) checkNodesCreated(cluster *model.Cluster, logger log
return model.ClusterStateCreationFailed
}
if !ready {
logger.Debug("Cluster nodegroups are not ready yet")
logger.Debug("Cluster nodegroups not yet ready")
return model.ClusterStateWaitingForNodes
}

Expand Down
4 changes: 2 additions & 2 deletions internal/tools/aws/ec2.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ func (a *Client) CreateLaunchTemplate(data *model.LaunchTemplateData) error {

eksCluster, err := a.getEKSCluster(data.ClusterName)
if err != nil {
return errors.Wrap(err, "failed to get EKS Cluster")
return errors.Wrap(err, "failed to get EKS cluster")
}

userData := getLaunchTemplateUserData(eksCluster, data)
Expand Down Expand Up @@ -225,7 +225,7 @@ func (a *Client) UpdateLaunchTemplate(data *model.LaunchTemplateData) error {

eksCluster, err := a.getEKSCluster(data.ClusterName)
if err != nil {
return errors.Wrap(err, "failed to get ESK Cluster")
return errors.Wrap(err, "failed to get ESK cluster")
}

userData := getLaunchTemplateUserData(eksCluster, data)
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 @@ -70,7 +70,7 @@ func (c *Client) createEKSCluster(cluster *model.Cluster, resources ClusterResou

out, err := c.Service().eks.CreateCluster(ctx, &input)
if err != nil {
return nil, errors.Wrap(err, "failed to create EKS Cluster")
return nil, errors.Wrap(err, "failed to create EKS cluster")
}

return out.Cluster, nil
Expand All @@ -83,7 +83,7 @@ func (a *Client) getEKSCluster(clusterName string) (*eksTypes.Cluster, error) {
})
if err != nil {
if !IsErrorResourceNotFound(err) {
return nil, errors.Wrap(err, "failed to describe EKS Cluster")
return nil, errors.Wrap(err, "failed to describe EKS cluster")
}
}

Expand Down Expand Up @@ -162,11 +162,11 @@ func (c *Client) EnsureEKSClusterUpdated(cluster *model.Cluster) (*eksTypes.Upda
}

if eksCluster == nil {
return nil, errors.Errorf("requested EKS Cluster %s is not found", clusterName)
return nil, errors.Errorf("requested EKS cluster %s does not exist", clusterName)
}

if eksCluster.Status != eksTypes.ClusterStatusActive {
return nil, errors.Errorf("requested EKS Cluster %s is not active", clusterName)
return nil, errors.Errorf("requested EKS cluster %s is not active", clusterName)
}

eksMetadata := cluster.ProvisionerMetadataEKS
Expand All @@ -180,7 +180,7 @@ func (c *Client) EnsureEKSClusterUpdated(cluster *model.Cluster) (*eksTypes.Upda
})

if err != nil {
return nil, errors.Wrap(err, "failed to update EKS Cluster version")
return nil, errors.Wrap(err, "failed to update EKS cluster version")
}

return output.Update, nil
Expand All @@ -191,7 +191,7 @@ func (a *Client) createEKSNodeGroup(cluster *model.Cluster, ngPrefix string) (*e
eksMetadata := cluster.ProvisionerMetadataEKS
changeRequest := eksMetadata.ChangeRequest
if changeRequest == nil {
return nil, errors.New("metadata ChangeRequest is not set")
return nil, errors.New("metadata ChangeRequest is nil")
}

clusterResource, err := a.GetVpcResourcesByVpcID(changeRequest.VPC, a.logger)
Expand Down Expand Up @@ -307,7 +307,7 @@ func (c *Client) EnsureEKSNodegroup(cluster *model.Cluster, ngPrefix string) (*e

ngChangeRequest, found := changeRequest.NodeGroups[ngPrefix]
if !found {
return nil, errors.Errorf("nodegroup metadata for %s is not found in ChangeRequest", ngPrefix)
return nil, errors.Errorf("nodegroup metadata for %s not found in ChangeRequest", ngPrefix)
}

nodeGroup, err := c.getEKSNodeGroup(clusterName, ngChangeRequest.Name)
Expand All @@ -331,7 +331,7 @@ func (c *Client) EnsureEKSNodegroupMigrated(cluster *model.Cluster, ngPrefix str

ngChangeRequest, found := changeRequest.NodeGroups[ngPrefix]
if !found {
return errors.Errorf("nodegroup metadata for %s is not found in ChangeRequest", ngPrefix)
return errors.Errorf("nodegroup metadata for %s not found in ChangeRequest", ngPrefix)
}

clusterName := eksMetadata.Name
Expand Down Expand Up @@ -377,7 +377,7 @@ func (a *Client) EnsureEKSClusterDeleted(clusterName string) error {

eksCluster, err := a.getEKSCluster(clusterName)
if err != nil {
return errors.Wrap(err, "failed to describe EKS Cluster")
return errors.Wrap(err, "failed to describe EKS cluster")
}

if eksCluster == nil {
Expand All @@ -390,13 +390,13 @@ func (a *Client) EnsureEKSClusterDeleted(clusterName string) error {
}

if eksCluster.Status == eksTypes.ClusterStatusFailed {
return errors.New("requested EKS Cluster is in failed state")
return errors.New("requested EKS cluster is in failed state")
}

delInput := &eks.DeleteClusterInput{Name: aws.String(clusterName)}
_, err = a.Service().eks.DeleteCluster(ctx, delInput)
if err != nil {
return errors.Wrap(err, "failed to trigger EKS Cluster deletion")
return errors.Wrap(err, "failed to trigger EKS cluster deletion")
}

// Cluster just started deletion
Expand Down Expand Up @@ -441,15 +441,15 @@ func (a *Client) EnsureEKSNodegroupDeleted(clusterName, nodegroupName string) er
func (c *Client) GetActiveEKSCluster(clusterName string) (*eksTypes.Cluster, error) {
cluster, err := c.getEKSCluster(clusterName)
if err != nil {
return nil, errors.Wrap(err, "failed to get EKS Cluster")
return nil, errors.Wrap(err, "failed to get EKS cluster")
}

if cluster == nil {
return nil, nil
}

if cluster.Status == eksTypes.ClusterStatusFailed {
return nil, errors.New("requested EKS Cluster is in failed state")
return nil, errors.New("requested EKS cluster is in failed state")
}

if cluster.Status == eksTypes.ClusterStatusActive {
Expand Down Expand Up @@ -491,11 +491,11 @@ func (c *Client) WaitForActiveEKSCluster(clusterName string, timeout int) (*eksT
for {
select {
case <-timeoutTimer.C:
return nil, errors.New("timed out waiting for EKS Cluster to become active")
return nil, errors.New("timed out waiting for EKS cluster to become active")
case <-tick.C:
eksCluster, err := c.GetActiveEKSCluster(clusterName)
if err != nil {
return nil, errors.Wrap(err, "failed to check if EKS Cluster is active")
return nil, errors.Wrap(err, "failed to check if EKS cluster is active")
}
if eksCluster != nil {
return eksCluster, nil
Expand Down Expand Up @@ -557,11 +557,11 @@ func (c *Client) WaitForEKSClusterToBeDeleted(clusterName string, timeout int) e
for {
select {
case <-timeoutTimer.C:
return errors.New("timed out waiting for EKS Cluster to become ready")
return errors.New("timed out waiting for EKS cluster to become ready")
case <-tick.C:
eksCluster, err := c.getEKSCluster(clusterName)
if err != nil {
return errors.Wrap(err, "failed to describe EKS Cluster")
return errors.Wrap(err, "failed to describe EKS cluster")
}
if eksCluster == nil {
return nil
Expand All @@ -579,15 +579,15 @@ func (c *Client) WaitForEKSClusterUpdateToBeCompleted(clusterName, updateID stri
for {
select {
case <-timeoutTimer.C:
return errors.New("timed out waiting for EKS Cluster update to be completed")
return errors.New("timed out waiting for EKS cluster update to be completed")
case <-tick.C:
updateStatus, err := c.getEKSClusterUpdateStatus(clusterName, updateID)
if err != nil {
return errors.Wrap(err, "failed to describe EKS Cluster")
return errors.Wrap(err, "failed to describe EKS cluster")
}

if updateStatus == eksTypes.UpdateStatusFailed {
return errors.New("failed to update EKS Cluster")
return errors.New("failed to update EKS cluster")
}

if updateStatus == eksTypes.UpdateStatusSuccessful {
Expand All @@ -603,7 +603,7 @@ func (c *Client) getEKSClusterUpdateStatus(clusterName, updateID string) (eksTyp
UpdateId: ptr.String(updateID),
})
if err != nil {
return "", errors.Wrap(err, "failed to describe update for EKS Cluster")
return "", errors.Wrap(err, "failed to describe update for EKS cluster")
}

return output.Update.Status, nil
Expand Down

0 comments on commit 48324d6

Please sign in to comment.