search

argoproj-labs / argocd-operator

A Kubernetes operator for managing Argo CD clusters.
https://argocd-operator.readthedocs.io
Apache License 2.0
636 stars 722 forks source link

Rebase master with 0.10.0 and 0.9.1 releases #1403

Closed reginapizza closed 3 months ago

reginapizza commented 4 months ago

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 chore /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?

Which issue(s) this PR fixes:

Fixes #?

How to test changes / Special notes to the reviewer:

reginapizza commented 4 months ago

@jgwest yes, I agree :') I was rebasing the master branch with the changes in the release-0.10 branch. After I released 0.10.0 I didn't update the master branch right away (slipped my mind with vacation and the amount of time it took to get the olm catalog PR's merged- my bad) but it seems like there were a lotttt of other changes also not synced to master branch from release-0.10 branch? I've already taken a look at the 0.10.0 changes that I made and I think there's okay, but I've requested Anand and Abhishek's reviews to make sure everything else looks right before we consider merging it. If you also wouldn't mind taking a look, the more eyes on it the better!

jgwest commented 4 months ago

@reginapizza Strangely, the 'Files Changed' tab of this PR seems to be reporting changes to master branch that are already on master branch. :thinking:

reginapizza commented 4 months ago

Okay I re-synced from master again (I can see I pulled from it originally, so I'm not really sure why it did all those commits over again) and now I think it looks much better! Thanks for the tip @jgwest

reginapizza commented 4 months ago

fyi- just updated this to also included the OLM manifests for the 0.9.1 release as well since those were also missing from master

anandf commented 4 months ago

Generated Code step is failing as there is diff reported in make bundle. @reginapizza Can you please take a look ?

reginapizza commented 3 months ago

@jgwest can you please re-review and remove requested changes if it looks okay now? There's currently a block on merging with it. Thank you!