fix: Image updater changes git write back file (argoproj-labs#970)

Signed-off-by: Cheng Fang <cfang@redhat.com>
chengfang · Dec 18, 2024 · 14e60b8 · 14e60b8
1 parent 70968a7
commit 14e60b8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/argocd/update.go b/pkg/argocd/update.go
@@ -676,7 +676,9 @@ func getWriteBackConfig(app *v1alpha1.Application, kubeClient *kube.KubernetesCl
 }
 
 func parseDefaultTarget(appNamespace string, appName string, path string, kubeClient *kube.KubernetesClient) string {
-	if (appNamespace == kubeClient.Namespace) || (appNamespace == "") {
+	// when running from command line and argocd-namespace is not set, e.g., via --argocd-namespace option,
+	// kubeClient.Namespace may be resolved to "default". In this case, also use the file name without namespace
+	if appNamespace == kubeClient.Namespace || kubeClient.Namespace == "default" || appNamespace == "" {
 		defaultTargetFile := fmt.Sprintf(common.DefaultTargetFilePatternWithoutNamespace, appName)
 		return filepath.Join(path, defaultTargetFile)
 	} else {