diff options
| author | jannfis <jann@mistrust.net> | 2020-08-06 12:35:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-06 12:35:15 +0200 |
| commit | f77b7fde52fed1d7a03b0ec82d35d0d3fc096cfe (patch) | |
| tree | da41224732f598789b823ae77091f4d8e76b4ef6 /pkg | |
| parent | e71ae62ea369225176a6dbb5581c41306a53aa82 (diff) | |
refactor: Reduce ArgoCD client requests (#4)
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/argocd/argocd.go | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pkg/argocd/argocd.go b/pkg/argocd/argocd.go index 8ee07b1..9433edd 100644 --- a/pkg/argocd/argocd.go +++ b/pkg/argocd/argocd.go @@ -206,17 +206,14 @@ func mergeHelmParams(src []v1alpha1.HelmParameter, merge []v1alpha1.HelmParamete } // Set image parameters for a Helm application -func (client *ArgoCD) SetHelmImage(appName string, newImage *image.ContainerImage) error { +func (client *ArgoCD) SetHelmImage(app *v1alpha1.Application, newImage *image.ContainerImage) error { conn, appClient, err := client.Client.NewApplicationClient() if err != nil { return err } defer conn.Close() - app, err := appClient.Get(context.TODO(), &application.ApplicationQuery{Name: &appName}) - if err != nil { - return err - } + appName := app.GetName() helmParamImageName, helmParamImageTag := getHelmParamNamesFromAnnotation(app.GetAnnotations(), newImage.SymbolicName) log.WithContext(). @@ -262,17 +259,14 @@ func (client *ArgoCD) SetHelmImage(appName string, newImage *image.ContainerImag } // Set a Kustomize image -func (client *ArgoCD) SetKustomizeImage(appName string, newImage *image.ContainerImage) error { +func (client *ArgoCD) SetKustomizeImage(app *v1alpha1.Application, newImage *image.ContainerImage) error { conn, appClient, err := client.Client.NewApplicationClient() if err != nil { return err } defer conn.Close() - app, err := appClient.Get(context.TODO(), &application.ApplicationQuery{Name: &appName}) - if err != nil { - return err - } + appName := app.GetName() if appType := getApplicationType(app); appType != ApplicationTypeKustomize { return fmt.Errorf("cannot set Kustomize image on non-Kustomize application") |