Skip to content

Live: Internalize argocd operator (DO NOT SQUASH-MERGE) - #1286

Open
olivergondza wants to merge 1317 commits into
redhat-developer:masterfrom
olivergondza:internalize-argocd-operator-fr
Open

Live: Internalize argocd operator (DO NOT SQUASH-MERGE)#1286
olivergondza wants to merge 1317 commits into
redhat-developer:masterfrom
olivergondza:internalize-argocd-operator-fr

Conversation

@olivergondza

@olivergondza olivergondza commented Sep 9, 2026

Copy link
Copy Markdown
Collaborator

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:

This is a first step in factoring-in the argocd-operator. It purposefully does the minimum, to move forward in manageable steps. The goal of the PR is to do just enough for CI to pass to provide the needed safety net and have the codebase releasable.

Effective changes post merge: https://github.com/olivergondza/gitops-operator/commits/internalize-argocd-operator-fr/?since=2026-09-09

  • Use go.mod replace for a new directory argocd-operator on 018b360b1a9fe53b88ef2c5fb2aa143cd4b4b539.
  • Entire history was brought in via git filter-repo + git merge --allow-unrelated-histories
  • Make the lint, test and gosec work from the top level Makefile.
  • DCO refuses to validate more than 250 commits, hence it is failing.
  • Fixing unanticipated unit-test failures (tests was not hardened for openshift-ci)

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:

The exact procedure used to internalize the remote repository.

# In (throwaway replica of) argocd-operator on 018b360b1a9fe53b88ef2c5fb2aa143cd4b4b539
git tag -d $(git tag | grep rhos) api/v0.1.0
git tag -d $(git tag | grep -- "-rc")
git filter-repo --to-subdirectory-filter argocd-operator --tag-rename '':'argocd-operator-'

# In gitops-operator
git remote add intern ../argocd-operator-ingest
git fetch intern
git merge --allow-unrelated-histories intern master

!!! DO NOT SQUASH-MERGE !!!

akhilnittala and others added 30 commits November 11, 2025 14:48
…when HA enabled cluster has Only 3 worker nodes (#1933)

* fix: redis ha proxy rolling update pod in pending state

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

* fix: redis ha proxy rolling update pod in pending state

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

* fix: redis ha proxy rolling update pod in pending state

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

* fix: redis ha proxy rolling update pod in pending state

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

---------

Signed-off-by: akhil nittala <nakhil@redhat.com>
…ild (#1911)

Bumps ubi8/ubi-minimal from `58b1dc5` to `951ee3c`.

---
updated-dependencies:
- dependency-name: ubi8/ubi-minimal
  dependency-version: 951ee3cabb74246821ae31c2b808b7789310f5509882c153b7b178aaaeefa2d3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dkarpele <karpelevich@gmail.com>
Signed-off-by: Jonathan West <jonwest@redhat.com>
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4 to 5.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v4...v5)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…938)

* Documentation for support of notifications in any namespace

Signed-off-by: nmirasch <neus.miras@gmail.com>

* Minor grammatical fix: use proper abbreviation formatting.

Signed-off-by: nmirasch <neus.miras@gmail.com>

* Removed extra content

Signed-off-by: nmirasch <neus.miras@gmail.com>

---------

Signed-off-by: nmirasch <neus.miras@gmail.com>
* Add testing for support notifications in any namespace

Signed-off-by: nmirasch <neus.miras@gmail.com>

* NotificationController ClusterRole reconciliation added

Signed-off-by: nmirasch <neus.miras@gmail.com>

* Avoid printing error when skipping reconciliation of resources regarding the target namespace is not enabled

Signed-off-by: nmirasch <neus.miras@gmail.com>

* Add checks

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* changed test description

Signed-off-by: nmirasch <neus.miras@gmail.com>

---------

Signed-off-by: nmirasch <neus.miras@gmail.com>
Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
Co-authored-by: Siddhesh Ghadi <sghadi1203@gmail.com>
Signed-off-by: Jonathan West <jgwest@gmail.com>
Assisted by: Cursor

Signed-off-by: Jayendra Parsai <jparsai@redhat.com>
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.43.0 to 0.45.0.
- [Commits](golang/crypto@v0.43.0...v0.45.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-version: 0.45.0
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Jonathan West <jgwest@gmail.com>
* add namespace validation for notification resources

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

* Fix e2e test

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>

---------

Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
* fix: namespace validation for sourcenamespace

Assisted by: Cursor

Signed-off-by: Jayendra Parsai <jparsai@redhat.com>

* fix: namespace validation for sourcenamespace

Assisted by: Cursor

Signed-off-by: Jayendra Parsai <jparsai@redhat.com>

* fix: namespace validation for sourcenamespace

Signed-off-by: Jonathan West <jgwest@gmail.com>

* fix: namespace validation for sourcenamespace

Signed-off-by: Jonathan West <jgwest@gmail.com>

---------

Signed-off-by: Jayendra Parsai <jparsai@redhat.com>
Signed-off-by: Jonathan West <jgwest@gmail.com>
Co-authored-by: Jonathan West <jgwest@gmail.com>
Signed-off-by: Jonathan West <jgwest@gmail.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Jonathan West <jonwest@redhat.com>
Signed-off-by: Jonathan West <jgwest@gmail.com>
Signed-off-by: dkarpele <karpelevich@gmail.com>
Signed-off-by: Jonathan West <jgwest@gmail.com>
Signed-off-by: Jonathan West <jonwest@redhat.com>
…cleanup (#1978)

Signed-off-by: nmirasch <neus.miras@gmail.com>
Signed-off-by: Jonathan West <jonwest@redhat.com>
…(#1987)

Bumps [pymdown-extensions](https://github.com/facelessuser/pymdown-extensions) from 10.2.1 to 10.16.1.
- [Release notes](https://github.com/facelessuser/pymdown-extensions/releases)
- [Commits](facelessuser/pymdown-extensions@10.2.1...10.16.1)

---
updated-dependencies:
- dependency-name: pymdown-extensions
  dependency-version: 10.16.1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ild (#1969)

Bumps ubi8/ubi-minimal from `951ee3c` to `7b6b45d`.

---
updated-dependencies:
- dependency-name: ubi8/ubi-minimal
  dependency-version: 7b6b45dfd09bb032f3cabee6d4789d0e8fa8dd824b01783f301b0fdd43e632f7
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…ild (#1992)

Bumps ubi8/ubi-minimal from `7b6b45d` to `2139859`.

---
updated-dependencies:
- dependency-name: ubi8/ubi-minimal
  dependency-version: 21398599ff11971e5084dae6f5fb8fd880b4b430b4dc2bc80780916066a9695e
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/cache](https://github.com/actions/cache) from 4 to 5.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](actions/cache@v4...v5)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…upgrade (#1991)

Signed-off-by: nmirasch <neus.miras@gmail.com>
* GITOPS-8249- added mapping of timeout.reconciliation to env var

Signed-off-by: Alka Kumari <alkumari@redhat.com>

* commit for retriggering the pipeline

Signed-off-by: Alka Kumari <alkumari@redhat.com>

---------

Signed-off-by: Alka Kumari <alkumari@redhat.com>
Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
…(#2007)

Bumps [github.com/argoproj/argo-cd/v3](https://github.com/argoproj/argo-cd) from 3.2.1 to 3.2.3.
- [Release notes](https://github.com/argoproj/argo-cd/releases)
- [Changelog](https://github.com/argoproj/argo-cd/blob/master/CHANGELOG.md)
- [Commits](argoproj/argo-cd@v3.2.1...v3.2.3)

---
updated-dependencies:
- dependency-name: github.com/argoproj/argo-cd/v3
  dependency-version: 3.2.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@olivergondza
olivergondza force-pushed the internalize-argocd-operator-fr branch from cdd3c5a to b1eb54a Compare September 10, 2026 09:02
@olivergondza

olivergondza commented Sep 10, 2026

Copy link
Copy Markdown
Collaborator Author

Running the unit tests in openshift-ci seem to have exposed a unittest test failure in a new argocd-operator code that was not part of the dry run (image_pull_secrets_test.go). While this is getting addressed, this PR is ready for review on its general soundness and correctness.

@anandf, @jgwest, @svghadi, @jannfis, Please prioritize taking a look. Effective changes post merge: https://github.com/olivergondza/gitops-operator/commits/internalize-argocd-operator-fr/?since=2026-09-09

@olivergondza

Copy link
Copy Markdown
Collaborator Author

Adding do-not-merge/hold so it does not get merged by GitHub once approved. Will merge manually to avoid squashing the history.

@olivergondza

Copy link
Copy Markdown
Collaborator Author

/retest

1 similar comment
@olivergondza

Copy link
Copy Markdown
Collaborator Author

/retest

Comment thread bundle/manifests/pipelines.openshift.io_gitopsservices.yaml
Comment thread cmd/main.go
@olivergondza

olivergondza commented Sep 11, 2026

Copy link
Copy Markdown
Collaborator Author

@anandf, I kept this PR minimal in changes on purpose - it is huge already. The idea was and still is to make the switch that blocks almost all contributions fast, and then drop what become unused later. Tracked as https://redhat.atlassian.net/browse/GITOPS-10900, I will amend it with your suggestions.

@jannfis

jannfis commented Sep 11, 2026

Copy link
Copy Markdown
Member

/approve

@olivergondza

Copy link
Copy Markdown
Collaborator Author

/test v4.19-kuttl-sequential

@olivergondza

Copy link
Copy Markdown
Collaborator Author

@olivergondza

Copy link
Copy Markdown
Collaborator Author

/test v4.19-kuttl-sequential

@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.

/approve

@openshift-ci

openshift-ci Bot commented Sep 14, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jannfis, 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

@olivergondza

Copy link
Copy Markdown
Collaborator Author

/test v4.19-kuttl-sequential

…ading the kubernetes.io token

Signed-off-by: Oliver Gondža <ogondza@gmail.com>
@olivergondza
olivergondza force-pushed the internalize-argocd-operator-fr branch from 21bd773 to 6307069 Compare September 14, 2026 08:20
@olivergondza olivergondza changed the title Live: Internalize argocd operator (DO NOT SQUASH-MERGE)- #1263 Live: Internalize argocd operator (DO NOT SQUASH-MERGE) Sep 14, 2026
…into internalize-argocd-operator-fr

Signed-off-by: Oliver Gondža <ogondza@gmail.com>
@olivergondza

Copy link
Copy Markdown
Collaborator Author

/test v4.19-kuttl-parallel

@openshift-ci

openshift-ci Bot commented Sep 14, 2026

Copy link
Copy Markdown

@olivergondza: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/v4.14-kuttl-sequential ae98868 link false /test v4.14-kuttl-sequential
ci/prow/v4.19-kuttl-sequential ae98868 link true /test v4.19-kuttl-sequential

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@olivergondza

Copy link
Copy Markdown
Collaborator Author

/retest

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.