diff options
| author | Merijn Wijngaard <mwijngaard@gmail.com> | 2024-06-07 22:09:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-07 16:09:59 -0400 |
| commit | f8b345b0a8a3af053cc6c16e62f76841f34279cb (patch) | |
| tree | 453617e82aceedd5ec70f5cf3b27c6faaea65710 | |
| parent | 3f47c8b200b90f5ccffaaa04136390965d44daab (diff) | |
fix: Pass AppNamespace to UpdateSpec api call (#687)
Signed-off-by: Merijn Wijngaard <mwijngaard@gmail.com>
| -rw-r--r-- | pkg/argocd/update.go | 5 | ||||
| -rw-r--r-- | pkg/argocd/update_test.go | 12 |
2 files changed, 12 insertions, 5 deletions
diff --git a/pkg/argocd/update.go b/pkg/argocd/update.go index 0f1cab2..d5afa49 100644 --- a/pkg/argocd/update.go +++ b/pkg/argocd/update.go @@ -619,8 +619,9 @@ func commitChanges(app *v1alpha1.Application, wbc *WriteBackConfig, changeList [ switch wbc.Method { case WriteBackApplication: _, err := wbc.ArgoClient.UpdateSpec(context.TODO(), &application.ApplicationUpdateSpecRequest{ - Name: &app.Name, - Spec: &app.Spec, + Name: &app.Name, + AppNamespace: &app.Namespace, + Spec: &app.Spec, }) if err != nil { return err diff --git a/pkg/argocd/update_test.go b/pkg/argocd/update_test.go index fd427b4..83aded3 100644 --- a/pkg/argocd/update_test.go +++ b/pkg/argocd/update_test.go @@ -21,6 +21,7 @@ import ( "github.com/argoproj-labs/argocd-image-updater/test/fake" "github.com/argoproj-labs/argocd-image-updater/test/fixture" + "github.com/argoproj/argo-cd/v2/pkg/apiclient/application" "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" argogit "github.com/argoproj/argo-cd/v2/util/git" "github.com/distribution/distribution/v3/manifest/schema1" //nolint:staticcheck @@ -103,9 +104,6 @@ func Test_UpdateApplication(t *testing.T) { return ®Mock, nil } - argoClient := argomock.ArgoCD{} - argoClient.On("UpdateSpec", mock.Anything, mock.Anything).Return(nil, nil) - kubeClient := kube.KubernetesClient{ Clientset: fake.NewFakeKubeClient(), } @@ -137,6 +135,14 @@ func Test_UpdateApplication(t *testing.T) { image.NewFromIdentifier("jannfis/foobar:~1.0.0"), }, } + + argoClient := argomock.ArgoCD{} + argoClient.On("UpdateSpec", mock.Anything, &application.ApplicationUpdateSpecRequest{ + Name: &appImages.Application.Name, + AppNamespace: &appImages.Application.Namespace, + Spec: &appImages.Application.Spec, + }).Return(nil, nil) + res := UpdateApplication(&UpdateConfiguration{ NewRegFN: mockClientFn, ArgoClient: &argoClient, |