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 /cmd | |
| parent | e71ae62ea369225176a6dbb5581c41306a53aa82 (diff) | |
refactor: Reduce ArgoCD client requests (#4)
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/main.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/main.go b/cmd/main.go index 60c88b9..f3cef77 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -75,7 +75,7 @@ func runImageUpdater(cfg *ImageUpdaterConfig) (ImageUpdaterResult, error) { log.Debugf("Considering %d applications with annotations for update", len(appList)) - for app, allowedImages := range appList { + for app, curApplication := range appList { // Get all images that are deployed with the current application applicationImages, err := argoClient.GetImagesFromApplication(app) @@ -92,7 +92,7 @@ func runImageUpdater(cfg *ImageUpdaterConfig) (ImageUpdaterResult, error) { // constraints which are part of the application's annotation values. // for _, applicationImage := range applicationImages { - updateableImage := allowedImages.Images.ContainsImage(applicationImage, false) + updateableImage := curApplication.Images.ContainsImage(applicationImage, false) if updateableImage == nil { log.WithContext().AddField("application", app).Debugf("Image %s not in list of allowed images, skipping", applicationImage.ImageName) result.NumSkipped += 1 @@ -149,10 +149,10 @@ func runImageUpdater(cfg *ImageUpdaterConfig) (ImageUpdaterResult, error) { if applicationImage.ImageTag != latest { imgCtx.Infof("Upgrading image to %s", applicationImage.WithTag(latest).String()) - if appType := argoClient.GetApplicationType(&allowedImages.Application); appType == argocd.ApplicationTypeKustomize { - err = argoClient.SetKustomizeImage(app, applicationImage.WithTag(latest)) + if appType := argoClient.GetApplicationType(&curApplication.Application); appType == argocd.ApplicationTypeKustomize { + err = argoClient.SetKustomizeImage(&curApplication.Application, applicationImage.WithTag(latest)) } else if appType == argocd.ApplicationTypeHelm { - err = argoClient.SetHelmImage(app, applicationImage.WithTag(latest)) + err = argoClient.SetHelmImage(&curApplication.Application, applicationImage.WithTag(latest)) } else { result.NumErrors += 1 err = fmt.Errorf("Could not update application %s - neither Helm nor Kustomize application", app) |