Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package argocd-cli for openSUSE:Factory checked in at 2026-03-30 18:30:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/argocd-cli (Old) and /work/SRC/openSUSE:Factory/.argocd-cli.new.1999 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "argocd-cli" Mon Mar 30 18:30:35 2026 rev:64 rq:1343475 version:3.3.6 Changes: -------- --- /work/SRC/openSUSE:Factory/argocd-cli/argocd-cli.changes 2026-03-27 06:36:27.733719666 +0100 +++ /work/SRC/openSUSE:Factory/.argocd-cli.new.1999/argocd-cli.changes 2026-03-30 18:33:27.236462981 +0200 @@ -1,0 +2,6 @@ +Sun Mar 29 16:44:28 UTC 2026 - Johannes Kastl <[email protected]> + +- Update to version 3.3.6: + No CLI-related changes or dependency updates + +------------------------------------------------------------------- Old: ---- argocd-cli-3.3.5.obscpio New: ---- argocd-cli-3.3.6.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ argocd-cli.spec ++++++ --- /var/tmp/diff_new_pack.50JLks/_old 2026-03-30 18:33:34.704775215 +0200 +++ /var/tmp/diff_new_pack.50JLks/_new 2026-03-30 18:33:34.708775383 +0200 @@ -19,7 +19,7 @@ %define executable_name argocd Name: argocd-cli -Version: 3.3.5 +Version: 3.3.6 Release: 0 Summary: CLI for the ArgoCD declarative continuous deployment tool License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.50JLks/_old 2026-03-30 18:33:34.760777556 +0200 +++ /var/tmp/diff_new_pack.50JLks/_new 2026-03-30 18:33:34.764777724 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/argoproj/argo-cd</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v3.3.5</param> + <param name="revision">v3.3.6</param> <param name="match-tag">v*</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.50JLks/_old 2026-03-30 18:33:34.792778894 +0200 +++ /var/tmp/diff_new_pack.50JLks/_new 2026-03-30 18:33:34.796779062 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/argoproj/argo-cd</param> - <param name="changesrevision">b8b5ea61172f10e8701659aaa82ed383eef8578f</param></service></servicedata> + <param name="changesrevision">998fb59dc355653c0657908a6ea2f87136e022d1</param></service></servicedata> (No newline at EOF) ++++++ argocd-cli-3.3.5.obscpio -> argocd-cli-3.3.6.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argocd-cli-3.3.5/VERSION new/argocd-cli-3.3.6/VERSION --- old/argocd-cli-3.3.5/VERSION 2026-03-25 14:52:26.000000000 +0100 +++ new/argocd-cli-3.3.6/VERSION 2026-03-27 14:36:58.000000000 +0100 @@ -1 +1 @@ -3.3.5 +3.3.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argocd-cli-3.3.5/controller/appcontroller.go new/argocd-cli-3.3.6/controller/appcontroller.go --- old/argocd-cli-3.3.5/controller/appcontroller.go 2026-03-25 14:52:26.000000000 +0100 +++ new/argocd-cli-3.3.6/controller/appcontroller.go 2026-03-27 14:36:58.000000000 +0100 @@ -1846,7 +1846,7 @@ logCtx = logCtx.WithField(k, v.Milliseconds()) } - ctrl.normalizeApplication(origApp, app) + ctrl.normalizeApplication(app) ts.AddCheckpoint("normalize_application_ms") tree, err := ctrl.setAppManagedResources(destCluster, app, compareResult) @@ -2085,7 +2085,8 @@ } // normalizeApplication normalizes an application.spec and additionally persists updates if it changed -func (ctrl *ApplicationController) normalizeApplication(orig, app *appv1.Application) { +func (ctrl *ApplicationController) normalizeApplication(app *appv1.Application) { + orig := app.DeepCopy() app.Spec = *argo.NormalizeApplicationSpec(&app.Spec) logCtx := log.WithFields(applog.GetAppLogFields(app)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argocd-cli-3.3.5/manifests/base/commit-server/kustomization.yaml new/argocd-cli-3.3.6/manifests/base/commit-server/kustomization.yaml --- old/argocd-cli-3.3.5/manifests/base/commit-server/kustomization.yaml 2026-03-25 14:52:26.000000000 +0100 +++ new/argocd-cli-3.3.6/manifests/base/commit-server/kustomization.yaml 2026-03-27 14:36:58.000000000 +0100 @@ -12,4 +12,4 @@ images: - name: quay.io/argoproj/argocd newName: quay.io/argoproj/argocd - newTag: v3.3.5 + newTag: v3.3.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argocd-cli-3.3.5/manifests/base/kustomization.yaml new/argocd-cli-3.3.6/manifests/base/kustomization.yaml --- old/argocd-cli-3.3.5/manifests/base/kustomization.yaml 2026-03-25 14:52:26.000000000 +0100 +++ new/argocd-cli-3.3.6/manifests/base/kustomization.yaml 2026-03-27 14:36:58.000000000 +0100 @@ -5,7 +5,7 @@ images: - name: quay.io/argoproj/argocd newName: quay.io/argoproj/argocd - newTag: v3.3.5 + newTag: v3.3.6 resources: - ./application-controller - ./dex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argocd-cli-3.3.5/manifests/core-install/kustomization.yaml new/argocd-cli-3.3.6/manifests/core-install/kustomization.yaml --- old/argocd-cli-3.3.5/manifests/core-install/kustomization.yaml 2026-03-25 14:52:26.000000000 +0100 +++ new/argocd-cli-3.3.6/manifests/core-install/kustomization.yaml 2026-03-27 14:36:58.000000000 +0100 @@ -12,4 +12,4 @@ images: - name: quay.io/argoproj/argocd newName: quay.io/argoproj/argocd - newTag: v3.3.5 + newTag: v3.3.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argocd-cli-3.3.5/manifests/core-install-with-hydrator.yaml new/argocd-cli-3.3.6/manifests/core-install-with-hydrator.yaml --- old/argocd-cli-3.3.5/manifests/core-install-with-hydrator.yaml 2026-03-25 14:52:26.000000000 +0100 +++ new/argocd-cli-3.3.6/manifests/core-install-with-hydrator.yaml 2026-03-27 14:36:58.000000000 +0100 @@ -31273,7 +31273,7 @@ key: applicationsetcontroller.status.max.resources.count name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-applicationset-controller ports: @@ -31408,7 +31408,7 @@ key: log.format.timestamp name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -31536,7 +31536,7 @@ - argocd - admin - redis-initial-password - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: IfNotPresent name: secret-init securityContext: @@ -31833,7 +31833,7 @@ value: /helm-working-dir - name: HELM_DATA_HOME value: /helm-working-dir - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -31886,7 +31886,7 @@ command: - sh - -c - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 name: copyutil securityContext: allowPrivilegeEscalation: false @@ -32234,7 +32234,7 @@ optional: true - name: KUBECACHEDIR value: /tmp/kubecache - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-application-controller ports: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argocd-cli-3.3.5/manifests/core-install.yaml new/argocd-cli-3.3.6/manifests/core-install.yaml --- old/argocd-cli-3.3.5/manifests/core-install.yaml 2026-03-25 14:52:26.000000000 +0100 +++ new/argocd-cli-3.3.6/manifests/core-install.yaml 2026-03-27 14:36:58.000000000 +0100 @@ -31241,7 +31241,7 @@ key: applicationsetcontroller.status.max.resources.count name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-applicationset-controller ports: @@ -31370,7 +31370,7 @@ - argocd - admin - redis-initial-password - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: IfNotPresent name: secret-init securityContext: @@ -31667,7 +31667,7 @@ value: /helm-working-dir - name: HELM_DATA_HOME value: /helm-working-dir - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -31720,7 +31720,7 @@ command: - sh - -c - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 name: copyutil securityContext: allowPrivilegeEscalation: false @@ -32068,7 +32068,7 @@ optional: true - name: KUBECACHEDIR value: /tmp/kubecache - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-application-controller ports: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argocd-cli-3.3.5/manifests/ha/base/kustomization.yaml new/argocd-cli-3.3.6/manifests/ha/base/kustomization.yaml --- old/argocd-cli-3.3.5/manifests/ha/base/kustomization.yaml 2026-03-25 14:52:26.000000000 +0100 +++ new/argocd-cli-3.3.6/manifests/ha/base/kustomization.yaml 2026-03-27 14:36:58.000000000 +0100 @@ -12,7 +12,7 @@ images: - name: quay.io/argoproj/argocd newName: quay.io/argoproj/argocd - newTag: v3.3.5 + newTag: v3.3.6 resources: - ../../base/application-controller - ../../base/applicationset-controller diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argocd-cli-3.3.5/manifests/ha/install-with-hydrator.yaml new/argocd-cli-3.3.6/manifests/ha/install-with-hydrator.yaml --- old/argocd-cli-3.3.5/manifests/ha/install-with-hydrator.yaml 2026-03-25 14:52:26.000000000 +0100 +++ new/argocd-cli-3.3.6/manifests/ha/install-with-hydrator.yaml 2026-03-27 14:36:58.000000000 +0100 @@ -32639,7 +32639,7 @@ key: applicationsetcontroller.status.max.resources.count name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-applicationset-controller ports: @@ -32774,7 +32774,7 @@ key: log.format.timestamp name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -32925,7 +32925,7 @@ - -n - /usr/local/bin/argocd - /shared/argocd-dex - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: copyutil securityContext: @@ -33021,7 +33021,7 @@ key: notificationscontroller.repo.server.plaintext name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: tcpSocket: @@ -33145,7 +33145,7 @@ - argocd - admin - redis-initial-password - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: IfNotPresent name: secret-init securityContext: @@ -33468,7 +33468,7 @@ value: /helm-working-dir - name: HELM_DATA_HOME value: /helm-working-dir - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -33521,7 +33521,7 @@ command: - sh - -c - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 name: copyutil securityContext: allowPrivilegeEscalation: false @@ -33895,7 +33895,7 @@ key: server.sync.replace.allowed name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: httpGet: @@ -34279,7 +34279,7 @@ optional: true - name: KUBECACHEDIR value: /tmp/kubecache - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-application-controller ports: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argocd-cli-3.3.5/manifests/ha/install.yaml new/argocd-cli-3.3.6/manifests/ha/install.yaml --- old/argocd-cli-3.3.5/manifests/ha/install.yaml 2026-03-25 14:52:26.000000000 +0100 +++ new/argocd-cli-3.3.6/manifests/ha/install.yaml 2026-03-27 14:36:58.000000000 +0100 @@ -32609,7 +32609,7 @@ key: applicationsetcontroller.status.max.resources.count name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-applicationset-controller ports: @@ -32761,7 +32761,7 @@ - -n - /usr/local/bin/argocd - /shared/argocd-dex - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: copyutil securityContext: @@ -32857,7 +32857,7 @@ key: notificationscontroller.repo.server.plaintext name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: tcpSocket: @@ -32981,7 +32981,7 @@ - argocd - admin - redis-initial-password - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: IfNotPresent name: secret-init securityContext: @@ -33304,7 +33304,7 @@ value: /helm-working-dir - name: HELM_DATA_HOME value: /helm-working-dir - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -33357,7 +33357,7 @@ command: - sh - -c - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 name: copyutil securityContext: allowPrivilegeEscalation: false @@ -33731,7 +33731,7 @@ key: server.sync.replace.allowed name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: httpGet: @@ -34115,7 +34115,7 @@ optional: true - name: KUBECACHEDIR value: /tmp/kubecache - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-application-controller ports: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argocd-cli-3.3.5/manifests/ha/namespace-install-with-hydrator.yaml new/argocd-cli-3.3.6/manifests/ha/namespace-install-with-hydrator.yaml --- old/argocd-cli-3.3.5/manifests/ha/namespace-install-with-hydrator.yaml 2026-03-25 14:52:26.000000000 +0100 +++ new/argocd-cli-3.3.6/manifests/ha/namespace-install-with-hydrator.yaml 2026-03-27 14:36:58.000000000 +0100 @@ -1897,7 +1897,7 @@ key: applicationsetcontroller.status.max.resources.count name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-applicationset-controller ports: @@ -2032,7 +2032,7 @@ key: log.format.timestamp name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -2183,7 +2183,7 @@ - -n - /usr/local/bin/argocd - /shared/argocd-dex - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: copyutil securityContext: @@ -2279,7 +2279,7 @@ key: notificationscontroller.repo.server.plaintext name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: tcpSocket: @@ -2403,7 +2403,7 @@ - argocd - admin - redis-initial-password - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: IfNotPresent name: secret-init securityContext: @@ -2726,7 +2726,7 @@ value: /helm-working-dir - name: HELM_DATA_HOME value: /helm-working-dir - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -2779,7 +2779,7 @@ command: - sh - -c - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 name: copyutil securityContext: allowPrivilegeEscalation: false @@ -3153,7 +3153,7 @@ key: server.sync.replace.allowed name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: httpGet: @@ -3537,7 +3537,7 @@ optional: true - name: KUBECACHEDIR value: /tmp/kubecache - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-application-controller ports: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argocd-cli-3.3.5/manifests/ha/namespace-install.yaml new/argocd-cli-3.3.6/manifests/ha/namespace-install.yaml --- old/argocd-cli-3.3.5/manifests/ha/namespace-install.yaml 2026-03-25 14:52:26.000000000 +0100 +++ new/argocd-cli-3.3.6/manifests/ha/namespace-install.yaml 2026-03-27 14:36:58.000000000 +0100 @@ -1867,7 +1867,7 @@ key: applicationsetcontroller.status.max.resources.count name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-applicationset-controller ports: @@ -2019,7 +2019,7 @@ - -n - /usr/local/bin/argocd - /shared/argocd-dex - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: copyutil securityContext: @@ -2115,7 +2115,7 @@ key: notificationscontroller.repo.server.plaintext name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: tcpSocket: @@ -2239,7 +2239,7 @@ - argocd - admin - redis-initial-password - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: IfNotPresent name: secret-init securityContext: @@ -2562,7 +2562,7 @@ value: /helm-working-dir - name: HELM_DATA_HOME value: /helm-working-dir - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -2615,7 +2615,7 @@ command: - sh - -c - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 name: copyutil securityContext: allowPrivilegeEscalation: false @@ -2989,7 +2989,7 @@ key: server.sync.replace.allowed name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: httpGet: @@ -3373,7 +3373,7 @@ optional: true - name: KUBECACHEDIR value: /tmp/kubecache - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-application-controller ports: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argocd-cli-3.3.5/manifests/install-with-hydrator.yaml new/argocd-cli-3.3.6/manifests/install-with-hydrator.yaml --- old/argocd-cli-3.3.5/manifests/install-with-hydrator.yaml 2026-03-25 14:52:26.000000000 +0100 +++ new/argocd-cli-3.3.6/manifests/install-with-hydrator.yaml 2026-03-27 14:36:58.000000000 +0100 @@ -31717,7 +31717,7 @@ key: applicationsetcontroller.status.max.resources.count name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-applicationset-controller ports: @@ -31852,7 +31852,7 @@ key: log.format.timestamp name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -32003,7 +32003,7 @@ - -n - /usr/local/bin/argocd - /shared/argocd-dex - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: copyutil securityContext: @@ -32099,7 +32099,7 @@ key: notificationscontroller.repo.server.plaintext name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: tcpSocket: @@ -32201,7 +32201,7 @@ - argocd - admin - redis-initial-password - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: IfNotPresent name: secret-init securityContext: @@ -32498,7 +32498,7 @@ value: /helm-working-dir - name: HELM_DATA_HOME value: /helm-working-dir - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -32551,7 +32551,7 @@ command: - sh - -c - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 name: copyutil securityContext: allowPrivilegeEscalation: false @@ -32923,7 +32923,7 @@ key: server.sync.replace.allowed name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: httpGet: @@ -33307,7 +33307,7 @@ optional: true - name: KUBECACHEDIR value: /tmp/kubecache - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-application-controller ports: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argocd-cli-3.3.5/manifests/install.yaml new/argocd-cli-3.3.6/manifests/install.yaml --- old/argocd-cli-3.3.5/manifests/install.yaml 2026-03-25 14:52:26.000000000 +0100 +++ new/argocd-cli-3.3.6/manifests/install.yaml 2026-03-27 14:36:58.000000000 +0100 @@ -31685,7 +31685,7 @@ key: applicationsetcontroller.status.max.resources.count name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-applicationset-controller ports: @@ -31837,7 +31837,7 @@ - -n - /usr/local/bin/argocd - /shared/argocd-dex - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: copyutil securityContext: @@ -31933,7 +31933,7 @@ key: notificationscontroller.repo.server.plaintext name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: tcpSocket: @@ -32035,7 +32035,7 @@ - argocd - admin - redis-initial-password - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: IfNotPresent name: secret-init securityContext: @@ -32332,7 +32332,7 @@ value: /helm-working-dir - name: HELM_DATA_HOME value: /helm-working-dir - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -32385,7 +32385,7 @@ command: - sh - -c - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 name: copyutil securityContext: allowPrivilegeEscalation: false @@ -32757,7 +32757,7 @@ key: server.sync.replace.allowed name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: httpGet: @@ -33141,7 +33141,7 @@ optional: true - name: KUBECACHEDIR value: /tmp/kubecache - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-application-controller ports: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argocd-cli-3.3.5/manifests/namespace-install-with-hydrator.yaml new/argocd-cli-3.3.6/manifests/namespace-install-with-hydrator.yaml --- old/argocd-cli-3.3.5/manifests/namespace-install-with-hydrator.yaml 2026-03-25 14:52:26.000000000 +0100 +++ new/argocd-cli-3.3.6/manifests/namespace-install-with-hydrator.yaml 2026-03-27 14:36:58.000000000 +0100 @@ -975,7 +975,7 @@ key: applicationsetcontroller.status.max.resources.count name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-applicationset-controller ports: @@ -1110,7 +1110,7 @@ key: log.format.timestamp name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -1261,7 +1261,7 @@ - -n - /usr/local/bin/argocd - /shared/argocd-dex - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: copyutil securityContext: @@ -1357,7 +1357,7 @@ key: notificationscontroller.repo.server.plaintext name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: tcpSocket: @@ -1459,7 +1459,7 @@ - argocd - admin - redis-initial-password - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: IfNotPresent name: secret-init securityContext: @@ -1756,7 +1756,7 @@ value: /helm-working-dir - name: HELM_DATA_HOME value: /helm-working-dir - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -1809,7 +1809,7 @@ command: - sh - -c - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 name: copyutil securityContext: allowPrivilegeEscalation: false @@ -2181,7 +2181,7 @@ key: server.sync.replace.allowed name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: httpGet: @@ -2565,7 +2565,7 @@ optional: true - name: KUBECACHEDIR value: /tmp/kubecache - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-application-controller ports: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argocd-cli-3.3.5/manifests/namespace-install.yaml new/argocd-cli-3.3.6/manifests/namespace-install.yaml --- old/argocd-cli-3.3.5/manifests/namespace-install.yaml 2026-03-25 14:52:26.000000000 +0100 +++ new/argocd-cli-3.3.6/manifests/namespace-install.yaml 2026-03-27 14:36:58.000000000 +0100 @@ -943,7 +943,7 @@ key: applicationsetcontroller.status.max.resources.count name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-applicationset-controller ports: @@ -1095,7 +1095,7 @@ - -n - /usr/local/bin/argocd - /shared/argocd-dex - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: copyutil securityContext: @@ -1191,7 +1191,7 @@ key: notificationscontroller.repo.server.plaintext name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: tcpSocket: @@ -1293,7 +1293,7 @@ - argocd - admin - redis-initial-password - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: IfNotPresent name: secret-init securityContext: @@ -1590,7 +1590,7 @@ value: /helm-working-dir - name: HELM_DATA_HOME value: /helm-working-dir - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -1643,7 +1643,7 @@ command: - sh - -c - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 name: copyutil securityContext: allowPrivilegeEscalation: false @@ -2015,7 +2015,7 @@ key: server.sync.replace.allowed name: argocd-cmd-params-cm optional: true - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always livenessProbe: httpGet: @@ -2399,7 +2399,7 @@ optional: true - name: KUBECACHEDIR value: /tmp/kubecache - image: quay.io/argoproj/argocd:v3.3.5 + image: quay.io/argoproj/argocd:v3.3.6 imagePullPolicy: Always name: argocd-application-controller ports: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argocd-cli-3.3.5/util/git/creds.go new/argocd-cli-3.3.6/util/git/creds.go --- old/argocd-cli-3.3.5/util/git/creds.go 2026-03-25 14:52:26.000000000 +0100 +++ new/argocd-cli-3.3.6/util/git/creds.go 2026-03-27 14:36:58.000000000 +0100 @@ -659,10 +659,11 @@ opts.Page = resp.NextPage } - // Cache all installation IDs + // Cache each installation under its account's key so multiple orgs do not overwrite each other. for _, installation := range allInstallations { if installation.Account != nil && installation.Account.Login != nil && installation.ID != nil { - githubInstallationIdCache.Set(cacheKey, *installation.ID, gocache.DefaultExpiration) + instKey := fmt.Sprintf("%s:%s:%d", strings.ToLower(*installation.Account.Login), domain, appId) + githubInstallationIdCache.Set(instKey, *installation.ID, gocache.DefaultExpiration) } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argocd-cli-3.3.5/util/git/creds_test.go new/argocd-cli-3.3.6/util/git/creds_test.go --- old/argocd-cli-3.3.5/util/git/creds_test.go 2026-03-25 14:52:26.000000000 +0100 +++ new/argocd-cli-3.3.6/util/git/creds_test.go 2026-03-27 14:36:58.000000000 +0100 @@ -610,6 +610,35 @@ require.NoError(t, err) assert.Equal(t, int64(98765), actualId) }) + + t.Run("returns correct installation ID when app is installed on multiple orgs", func(t *testing.T) { + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if strings.HasSuffix(r.URL.Path, "/app/installations") { + w.WriteHeader(http.StatusOK) + //nolint:errcheck + json.NewEncoder(w).Encode([]map[string]any{ + {"id": 11111, "account": map[string]any{"login": "org-alpha"}}, + {"id": 22222, "account": map[string]any{"login": "target-org"}}, + {"id": 33333, "account": map[string]any{"login": "org-gamma"}}, + }) + return + } + w.WriteHeader(http.StatusNotFound) + })) + defer server.Close() + + t.Cleanup(func() { + domain, _ := domainFromBaseURL(server.URL) + for _, org := range []string{"org-alpha", "target-org", "org-gamma"} { + githubInstallationIdCache.Delete(fmt.Sprintf("%s:%s:%d", org, domain, 12345)) + } + }) + + ctx := context.Background() + actualId, err := DiscoverGitHubAppInstallationID(ctx, 12345, fakeGitHubAppPrivateKey, server.URL, "target-org") + require.NoError(t, err) + assert.Equal(t, int64(22222), actualId, "should return the installation ID for the requested org, not the last one in the list") + }) } func TestExtractOrgFromRepoURL(t *testing.T) { ++++++ argocd-cli.obsinfo ++++++ --- /var/tmp/diff_new_pack.50JLks/_old 2026-03-30 18:33:43.121127085 +0200 +++ /var/tmp/diff_new_pack.50JLks/_new 2026-03-30 18:33:43.125127252 +0200 @@ -1,5 +1,5 @@ name: argocd-cli -version: 3.3.5 -mtime: 1774446746 -commit: b8b5ea61172f10e8701659aaa82ed383eef8578f +version: 3.3.6 +mtime: 1774618618 +commit: 998fb59dc355653c0657908a6ea2f87136e022d1 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/argocd-cli/vendor.tar.gz /work/SRC/openSUSE:Factory/.argocd-cli.new.1999/vendor.tar.gz differ: char 13, line 1
