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 fc7a6b0 commit f376ad7
Show file tree
Hide file tree
Showing 9 changed files with 135 additions and 134 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
2 changes: 1 addition & 1 deletion internal/api/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ func handleCreateNodegroups(c *Context, w http.ResponseWriter, r *http.Request)

clusterDTO, status, unlockOnce := getClusterForTransition(c, clusterID, newState)
if status != 0 {
c.Logger.Debug("Cluster is not in a valid state for nodegroup creation")
c.Logger.Debug("Cluster is not in a valid state for nodegroups creation")
w.WriteHeader(status)
return
}
Expand Down
72 changes: 36 additions & 36 deletions internal/mocks/aws-tools/client.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 14 additions & 13 deletions internal/provisioner/eks_provisioner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ func (provisioner *EKSProvisioner) CreateNodegroups(cluster *model.Cluster) erro
return
}

_, err = provisioner.awsClient.EnsureEKSNodeGroup(cluster, ngPrefix)
_, err = provisioner.awsClient.EnsureEKSNodegroup(cluster, ngPrefix)
if err != nil {
logger.WithError(err).Errorf("Failed to create EKS nodegroup %s", ngMetadata.Name)
errOccurred = true
Expand Down Expand Up @@ -304,7 +304,7 @@ func (provisioner *EKSProvisioner) CheckNodegroupsCreated(cluster *model.Cluster
wait := 300
logger.Infof("Waiting up to %d seconds for EKS nodegroup %s to become active...", wait, ngMetadata.Name)

nodeGroup, err := provisioner.awsClient.WaitForActiveEKSNodeGroup(eksMetadata.Name, ngMetadata.Name, wait)
nodeGroup, err := provisioner.awsClient.WaitForActiveEKSNodegroup(eksMetadata.Name, ngMetadata.Name, wait)
if err != nil {
logger.WithError(err).Errorf("Failed to wait for EKS nodegroup %s to become active", ngMetadata.Name)
errOccurred = true
Expand Down Expand Up @@ -349,7 +349,7 @@ func (provisioner *EKSProvisioner) CheckNodegroupsCreated(cluster *model.Cluster
return true, nil
}

// DeleteNodegroups deletes the EKS nodegroup.
// DeleteNodegroups deletes the EKS nodegroups.
func (provisioner *EKSProvisioner) DeleteNodegroups(cluster *model.Cluster) error {
logger := provisioner.logger.WithField("cluster", cluster.ID)

Expand All @@ -373,7 +373,7 @@ func (provisioner *EKSProvisioner) DeleteNodegroups(cluster *model.Cluster) erro
go func(ngPrefix string, ngMetadata model.NodeGroupMetadata) {
defer wg.Done()

err := provisioner.awsClient.EnsureEKSNodeGroupDeleted(eksMetadata.Name, ngMetadata.Name)
err := provisioner.awsClient.EnsureEKSNodegroupDeleted(eksMetadata.Name, ngMetadata.Name)
if err != nil {
logger.WithError(err).Errorf("Failed to delete EKS nodedroup %s", ngMetadata.Name)
errOccurred = true
Expand All @@ -382,7 +382,7 @@ func (provisioner *EKSProvisioner) DeleteNodegroups(cluster *model.Cluster) erro

wait := 600
logger.Infof("Waiting up to %d seconds for EKS nodegroup %s to be deleted...", wait, ngMetadata.Name)
err = provisioner.awsClient.WaitForEKSNodeGroupToBeDeleted(eksMetadata.Name, ngMetadata.Name, wait)
err = provisioner.awsClient.WaitForEKSNodegroupToBeDeleted(eksMetadata.Name, ngMetadata.Name, wait)
if err != nil {
logger.WithError(err).Errorf("Failed to delete EKS nodegroup %s", ngMetadata.Name)
errOccurred = true
Expand Down Expand Up @@ -476,7 +476,7 @@ func (provisioner *EKSProvisioner) UpgradeCluster(cluster *model.Cluster) error
return
}

err = provisioner.awsClient.EnsureEKSNodeGroupMigrated(cluster, ngPrefix)
err = provisioner.awsClient.EnsureEKSNodegroupMigrated(cluster, ngPrefix)
if err != nil {
logger.WithError(err).Errorf("Failed to migrate EKS nodegroup for %s", ngPrefix)
errOccurred = true
Expand Down Expand Up @@ -565,7 +565,7 @@ func (provisioner *EKSProvisioner) ResizeCluster(cluster *model.Cluster) error {
ngMetadata.CopyMissingFieldsFrom(oldMetadata)
changeRequest.NodeGroups[ngPrefix] = ngMetadata

oldEKSNodeGroup, err2 := provisioner.awsClient.GetActiveEKSNodeGroup(eksMetadata.Name, oldMetadata.Name)
oldEKSNodeGroup, err2 := provisioner.awsClient.GetActiveEKSNodegroup(eksMetadata.Name, oldMetadata.Name)
if err2 != nil {
logger.WithError(err2).Errorf("Failed to get the existing EKS nodegroup for %s", ngPrefix)
errOccurred = true
Expand All @@ -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 All @@ -590,14 +591,14 @@ func (provisioner *EKSProvisioner) ResizeCluster(cluster *model.Cluster) error {
return
}

err = provisioner.awsClient.EnsureEKSNodeGroupMigrated(cluster, ngPrefix)
err = provisioner.awsClient.EnsureEKSNodegroupMigrated(cluster, ngPrefix)
if err != nil {
logger.WithError(err).Errorf("Failed to migrate EKS nodegroup for %s", ngPrefix)
errOccurred = true
return
}

nodeGroup, err2 := provisioner.awsClient.GetActiveEKSNodeGroup(eksMetadata.Name, ngMetadata.Name)
nodeGroup, err2 := provisioner.awsClient.GetActiveEKSNodegroup(eksMetadata.Name, ngMetadata.Name)
if err2 != nil {
logger.WithError(err2).Errorf("Failed to get EKS nodegroup %s", ngMetadata.Name)
errOccurred = true
Expand Down Expand Up @@ -671,7 +672,7 @@ func (provisioner *EKSProvisioner) cleanupCluster(cluster *model.Cluster) error
go func(ngPrefix string, ngMetadata model.NodeGroupMetadata) {
defer wg.Done()

err = provisioner.awsClient.EnsureEKSNodeGroupDeleted(eksMetadata.Name, ngMetadata.Name)
err = provisioner.awsClient.EnsureEKSNodegroupDeleted(eksMetadata.Name, ngMetadata.Name)
if err != nil {
logger.WithError(err).Errorf("Failed to delete EKS nodegroup %s", ngMetadata.Name)
errOccurred = true
Expand All @@ -680,7 +681,7 @@ func (provisioner *EKSProvisioner) cleanupCluster(cluster *model.Cluster) error

wait := 600
logger.Infof("Waiting up to %d seconds for nodegroup %s to be deleted...", wait, ngMetadata.Name)
err = provisioner.awsClient.WaitForEKSNodeGroupToBeDeleted(eksMetadata.Name, ngMetadata.Name, wait)
err = provisioner.awsClient.WaitForEKSNodegroupToBeDeleted(eksMetadata.Name, ngMetadata.Name, wait)
if err != nil {
logger.WithError(err).Errorf("Failed to delete EKS nodegroup %s", ngMetadata.Name)
errOccurred = true
Expand All @@ -695,7 +696,7 @@ func (provisioner *EKSProvisioner) cleanupCluster(cluster *model.Cluster) error
return
}

logger.Debugf("Successfully deleted EKS NodeGroup %s", ngMetadata.Name)
logger.Debugf("Successfully deleted EKS nodegroup %s", ngMetadata.Name)
}(ng, meta)
}

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
10 changes: 5 additions & 5 deletions internal/supervisor/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ func (s *ClusterSupervisor) createNodegroups(cluster *model.Cluster, logger log.

_, err = s.provisioner.GetClusterProvisioner(cluster.Provisioner).CheckNodegroupsCreated(cluster)
if err != nil {
logger.WithError(err).Error("Failed to create nodegroups")
logger.WithError(err).Error("Failed to check if nodegroups are created")
return model.ClusterStateNodegroupsCreationFailed
}

Expand Down 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 @@ -340,11 +340,11 @@ func (s *ClusterSupervisor) checkNodesCreated(cluster *model.Cluster, logger log

ready, err := s.provisioner.GetClusterProvisioner(cluster.Provisioner).CheckNodegroupsCreated(cluster)
if err != nil {
logger.WithError(err).Error("Failed to check if nodegroups creation finished")
logger.WithError(err).Error("Failed to check if nodegroups are created")
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
12 changes: 6 additions & 6 deletions internal/supervisor/installation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -425,31 +425,31 @@ func (a *mockAWS) WaitForEKSClusterUpdateToBeCompleted(clusterName, updateID str
return nil
}

func (a *mockAWS) WaitForActiveEKSNodeGroup(clusterName, workerName string, timeout int) (*eksTypes.Nodegroup, error) {
func (a *mockAWS) WaitForActiveEKSNodegroup(clusterName, workerName string, timeout int) (*eksTypes.Nodegroup, error) {
return nil, nil
}

func (a *mockAWS) WaitForEKSClusterToBeDeleted(clusterName string, timeout int) error {
return nil
}

func (a *mockAWS) WaitForEKSNodeGroupToBeDeleted(clusterName, workerName string, timeout int) error {
func (a *mockAWS) WaitForEKSNodegroupToBeDeleted(clusterName, workerName string, timeout int) error {
return nil
}

func (a *mockAWS) EnsureEKSClusterUpdated(cluster *model.Cluster) (*eksTypes.Update, error) {
return nil, nil
}

func (a *mockAWS) EnsureEKSNodeGroupMigrated(cluster *model.Cluster, ngPrefix string) error {
func (a *mockAWS) EnsureEKSNodegroupMigrated(cluster *model.Cluster, ngPrefix string) error {
return nil
}

func (a *mockAWS) GetActiveEKSNodeGroup(clusterName, workerName string) (*eksTypes.Nodegroup, error) {
func (a *mockAWS) GetActiveEKSNodegroup(clusterName, workerName string) (*eksTypes.Nodegroup, error) {
return nil, nil
}

func (a *mockAWS) EnsureEKSNodeGroupDeleted(clusterName, workerName string) error {
func (a *mockAWS) EnsureEKSNodegroupDeleted(clusterName, workerName string) error {
return nil
}

Expand Down Expand Up @@ -506,7 +506,7 @@ func (a *mockAWS) EnsureEKSCluster(cluster *model.Cluster, resources aws.Cluster
return &eksTypes.Cluster{}, nil
}

func (a *mockAWS) EnsureEKSNodeGroup(cluster *model.Cluster, nodeGroupPrefix string) (*eksTypes.Nodegroup, error) {
func (a *mockAWS) EnsureEKSNodegroup(cluster *model.Cluster, nodeGroupPrefix string) (*eksTypes.Nodegroup, error) {
return &eksTypes.Nodegroup{}, nil
}

Expand Down
Loading

0 comments on commit f376ad7

Please sign in to comment.