Skip to content

fix: collect all ArgoCD instances in multi-tenant deployments - #51

Merged
olivergondza merged 1 commit into
redhat-developer:mainfrom
paladugu-anand:fix-multi-instance-collection
Oct 12, 2026
Merged

olivergondza merged 1 commit into
redhat-developer:mainfrom
paladugu-anand:fix-multi-instance-collection

Conversation

@paladugu-anand

@paladugu-anand paladugu-anand commented Sep 24, 2026 •

Copy link
Copy Markdown
Contributor

The must-gather script was adding leading spaces to namespace names when collecting ArgoCD instances, causing 'oc get ns' to fail silently due to --ignore-not-found flag. This resulted in missing pod logs and resources from secondary ArgoCD instances.

Changes:

  • Line 74: Removed leading space from ArgoCD namespace collection
  • Line 73: Fixed comma-separated namespace parsing to properly split values

Fixes: Multi-tenant ArgoCD deployments where secondary instances are not fully collected by must-gather.

What type of PR is this?

Uncomment only one /kind line, and delete the rest.
For example, > /kind bug would simply become: /kind bug

/kind bug
/kind cleanup
/kind failing-test
/kind enhancement
/kind documentation
/kind code-refactoring

What does this PR do / why we need it:

Have you updated the necessary documentation?

  • Documentation update is required by this PR.
  • Documentation has been updated.

Which issue(s) this PR fixes:

Fixes #?

Test acceptance criteria:

  • Unit Test
  • E2E Test

How to test changes / Special notes to the reviewer:

Tested the fixed build and it now is collecting all info for all argocd instances.

omc use /tmp/test-must-gather/
Must-Gather : /tmp/test-must-gather
Project : default
ClusterID : fa69705e-d493-4ba5-88d6-8c64b49f089f
ClusterVersion : 4.22.8

omc get argocd -A
NAMESPACE NAME AGE
openshift-gitops openshift-gitops 1d
prod-1 newargocd 4h

omc get projects
NAME STATUS AGE
openshift-gitops Active 1d
openshift-gitops-operator Active 1d
prod Active 1d
prod-1 Active 4h
prod-1-deploy Active 4h

omc get pods -A
NAMESPACE NAME READY STATUS RESTARTS AGE
openshift-gitops cluster-79754f5dcb-qlkz7 1/1 Running 0 1d
openshift-gitops gitops-plugin-6c657484f4-6st4b 1/1 Running 0 1d
openshift-gitops openshift-gitops-application-controller-0 1/1 Running 0 1d
openshift-gitops openshift-gitops-applicationset-controller-66b4588bfc-qx58z 1/1 Running 0 1d
openshift-gitops openshift-gitops-dex-server-5d6d5bcbc5-7j2zb 1/1 Running 0 1d
openshift-gitops openshift-gitops-redis-868f9fffc6-fsfvn 1/1 Running 0 1d
openshift-gitops openshift-gitops-repo-server-664589bf79-b4n4r 1/1 Running 0 1d
openshift-gitops openshift-gitops-server-5767cf5b6f-jrj97 1/1 Running 0 1d
openshift-gitops-operator openshift-gitops-operator-controller-manager-5c747c9898-sj64f 1/1 Running 0 1d
prod webapp-5bf7b89f7-k265w 1/1 Running 0 20h
prod-1 newargocd-application-controller-0 1/1 Running 0 4h
prod-1 newargocd-dex-server-5d87b64d6-9t7lb 1/1 Running 0 4h
prod-1 newargocd-redis-758fbd79bd-rtcmw 1/1 Running 0 4h
prod-1 newargocd-repo-server-664d787456-k7m59 1/1 Running 0 4h
prod-1 newargocd-server-58d66bfcd8-6bbpw 1/1 Running 0 4h

The must-gather script was adding leading spaces to namespace names when
collecting ArgoCD instances, causing 'oc get ns' to fail silently due to
--ignore-not-found flag. This resulted in missing pod logs and resources
from secondary ArgoCD instances.

Changes:
- Line 74: Removed leading space from ArgoCD namespace collection
- Line 73: Fixed comma-separated namespace parsing to properly split values

Fixes: Multi-tenant ArgoCD deployments where secondary instances are not
fully collected by must-gather.

Signed-off-by: Anand Paladugu <apaladug@redhat.com>
@olivergondza olivergondza self-assigned this Sep 25, 2026
@olivergondza

Copy link
Copy Markdown
Collaborator

/ok-to-test

@olivergondza
olivergondza merged commit 652c989 into redhat-developer:main Oct 12, 2026
3 checks passed
@olivergondza

Copy link
Copy Markdown
Collaborator

@paladugu-anand, thanks, works as a charm!

olivergondza added a commit to redhat-developer/gitops-operator that referenced this pull request Oct 14, 2026
Signed-off-by: Oliver Gondža <ogondza@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants