From 24a86c3bbf40d9c43f5c8f829804d71c6968b7af Mon Sep 17 00:00:00 2001 From: Andre Leite Date: Thu, 20 Jun 2024 11:34:05 -0300 Subject: [PATCH 1/2] [CLD-7878]Remove unnecessary argocd sync --- internal/provisioner/utility/argo_utility.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/internal/provisioner/utility/argo_utility.go b/internal/provisioner/utility/argo_utility.go index a595fa2d9..d48adf8af 100644 --- a/internal/provisioner/utility/argo_utility.go +++ b/internal/provisioner/utility/argo_utility.go @@ -119,21 +119,14 @@ func ProvisionUtilityArgocd(utilityName, tempDir, clusterID string, allowCIDRRan } appName := utilityName + "-sre-" + awsClient.GetCloudEnvironmentName() + "-" + clusterID - gitopsAppName := "gitops-sre-" + awsClient.GetCloudEnvironmentName() - - app, err := argocdClient.SyncApplication(gitopsAppName) - if err != nil { - return errors.Wrap(err, "failed to sync application") - } timeout := time.Second * 600 - err = argocdClient.WaitForAppHealthy(appName, timeout) if err != nil { return errors.Wrap(err, "failed to wait for application to be healthy") } - logger.WithField("app:", app.Name).Info("Deployed utility successfully.") + logger.WithField("Utility:", utilityName).Info("Deployed utility successfully.") return nil } From 4184be20ffcd995000816a769e550a093a9210ba Mon Sep 17 00:00:00 2001 From: Andre Leite Date: Thu, 20 Jun 2024 11:35:01 -0300 Subject: [PATCH 2/2] [CLD-7839]Skip err handle for argocd get app --- internal/tools/argocd/application.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/internal/tools/argocd/application.go b/internal/tools/argocd/application.go index e7d6fe7d7..aaa4276f4 100644 --- a/internal/tools/argocd/application.go +++ b/internal/tools/argocd/application.go @@ -47,12 +47,11 @@ func (c *ApiClient) WaitForAppHealthy(appName string, timeout time.Duration) err Name: &appName, Refresh: &refresh, }) - if err != nil { - return err - } - if app.Status.Health.Status == health.HealthStatusHealthy && app.Status.Sync.Status == argoappv1.SyncStatusCodeSynced { - break + if err == nil { + if app.Status.Health.Status == health.HealthStatusHealthy && app.Status.Sync.Status == argoappv1.SyncStatusCodeSynced { + break + } } // Check for timeout