Skip to content

[GITOPS-7475]: Default argocd instance does not get recreated after deletion#960

Merged
openshift-merge-bot[bot] merged 8 commits into
redhat-developer:masterfrom
akhilnittala:usr/akhil/GITOPS-7475
Sep 13, 2025
Merged

[GITOPS-7475]: Default argocd instance does not get recreated after deletion#960
openshift-merge-bot[bot] merged 8 commits into
redhat-developer:masterfrom
akhilnittala:usr/akhil/GITOPS-7475

Conversation

@akhilnittala

Copy link
Copy Markdown
Member

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

What does this PR do / why we need it:

Before these changes, deleting the default ArgoCD instance (openshift-gitops) did not trigger its automatic recreation. However, with these changes, the default instance is now correctly recreated when it is deleted.

Have you updated the necessary documentation?
No documentation required.

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

Which issue(s) this PR fixes:
https://issues.redhat.com/browse/GITOPS-7475

Fixes #?

Test acceptance criteria:

  • Unit Test
  • E2E Test

How to test changes / Special notes to the reviewer:

Deploy the GitOps Operator, then delete the default openshift-gitops instance from the openshift-gitops namespace. Verify if the instance is automatically recreated.

@openshift-ci

openshift-ci Bot commented Sep 9, 2025

Copy link
Copy Markdown

Hi @akhilnittala. Thanks for your PR.

I'm waiting for a redhat-developer member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@akhilnittala akhilnittala marked this pull request as ready for review September 9, 2025 08:56
Comment thread Makefile Outdated
@anandrkskd

Copy link
Copy Markdown
Contributor

/ok-to-test

Comment thread controllers/gitopsservice_controller.go Outdated

@anandf anandf left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @akhilnittala for working on this issue. Posted few comments. Otherwise looks good.

@akhilnittala akhilnittala requested a review from anandf September 9, 2025 10:02
@anandrkskd

Copy link
Copy Markdown
Contributor

/ok-to-test

…eletion

Signed-off-by: akhil nittala <nakhil@redhat.com>

Signed-off-by: akhil nittala <nakhil@redhat.com>
@akhilsharmanittala

Copy link
Copy Markdown

/retest

@svghadi svghadi left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @akhilnittala. Overall looks good. Left some comments.

Did we run any tests with DISABLE_DEFAULT_ARGOCD_INSTANCE=true env? This env var can be used to control creation and deletion of default ArgoCD instance. When set, the default instance should not be created.

https://docs.redhat.com/en/documentation/red_hat_openshift_gitops/1.13/html/argo_cd_instance/setting-up-argocd-instance

Comment thread Makefile Outdated
Comment thread Makefile Outdated
Comment thread Makefile Outdated
…eletion

Signed-off-by: akhil nittala <nakhil@redhat.com>
@akhilnittala

Copy link
Copy Markdown
Member Author

Thanks @akhilnittala. Overall looks good. Left some comments.

Did we run any tests with DISABLE_DEFAULT_ARGOCD_INSTANCE=true env? This env var can be used to control creation and deletion of default ArgoCD instance. When set, the default instance should not be created.

https://docs.redhat.com/en/documentation/red_hat_openshift_gitops/1.13/html/argo_cd_instance/setting-up-argocd-instance

Yes siddhesh, added env variable in manager.yaml in config files as - name: DISABLE_DEFAULT_ARGOCD_INSTANCE ; value: "true" and tested it, it didnt create default argocd instance.

…eletion

Signed-off-by: akhil nittala <nakhil@redhat.com>
@varshab1210

Copy link
Copy Markdown
Member

/test v4.14-e2e

anandf
anandf previously approved these changes Sep 10, 2025

@anandf anandf left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@svghadi

svghadi commented Sep 11, 2025

Copy link
Copy Markdown
Member

/lgtm

Thanks @akhilnittala . The change looks good. Can we add a sequential e2e test? You can use this as a reference: https://github.com/redhat-developer/gitops-operator/blob/master/test/openshift/e2e/ginkgo/sequential/1-018_validate_disable_default_instance_test.go

@openshift-ci openshift-ci Bot removed the lgtm label Sep 11, 2025
…eletion

Signed-off-by: akhil nittala <nakhil@redhat.com>
@svghadi

svghadi commented Sep 12, 2025

Copy link
Copy Markdown
Member

/lgtm
/approve

@openshift-ci openshift-ci Bot added the lgtm label Sep 12, 2025
@openshift-ci

openshift-ci Bot commented Sep 12, 2025

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: svghadi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@akhilnittala

Copy link
Copy Markdown
Member Author

/retest

1 similar comment
@akhilnittala

Copy link
Copy Markdown
Member Author

/retest

@openshift-ci openshift-ci Bot removed the lgtm label Sep 12, 2025
@openshift-ci

openshift-ci Bot commented Sep 12, 2025

Copy link
Copy Markdown

New changes are detected. LGTM label has been removed.

@openshift-merge-bot openshift-merge-bot Bot merged commit cfdfdb2 into redhat-developer:master Sep 13, 2025
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants