Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(appset): Fix name conflict in appset controller (#16207) #16222

Merged
merged 6 commits into from
Nov 6, 2023
Merged

fix(appset): Fix name conflict in appset controller (#16207) #16222

merged 6 commits into from
Nov 6, 2023

Conversation

speedfl
Copy link
Contributor

@speedfl speedfl commented Nov 2, 2023 •
edited by crenshaw-dev
Loading

Fixes #16207
Fixes #16114

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.

@speedfl
fix(16207): Fix name conflict in appset controller
d40f105 
Signed-off-by: gmuselli <geoffrey.muselli@gmail.com>
@speedfl speedfl requested a review from a team as a code owner November 2, 2023 19:17
@crenshaw-dev crenshaw-dev added this to the v2.9 milestone Nov 2, 2023
@crenshaw-dev crenshaw-dev changed the title fix(16207): Fix name conflict in appset controller fix(appset): Fix name conflict in appset controller (#16207) Nov 2, 2023
@speedfl
fix(16207): e2e
9674891 
Signed-off-by: gmuselli <geoffrey.muselli@gmail.com>
@speedfl
Merge branch 'bugfix/16207-appset-in-any-namespace' of github.com:spe…
1d2312e 
…edfl/argo-cd into bugfix/16207-appset-in-any-namespace
@speedfl speedfl requested a review from a team as a code owner November 2, 2023 21:51
@codecov Codecov
Copy link

codecov bot commented Nov 2, 2023 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (0b59bf8) 49.51% compared to head (ba085b2) 49.51%.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master   #16222   +/-   ##
=======================================
  Coverage   49.51%   49.51%           
=======================================
  Files         269      269           
  Lines       46972    46972           
=======================================
+ Hits        23257    23260    +3     
+ Misses      21433    21431    -2     
+ Partials     2282     2281    -1
Files Coverage Δ
...cationset/controllers/applicationset_controller.go 60.78% <100.00%> (ø)

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

ishitasequeira
ishitasequeira requested changes Nov 3, 2023
View reviewed changes
Copy link
Member

@ishitasequeira ishitasequeira left a comment

Choose a reason for hiding this comment

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

Overall change looks good!! Few minor comments.

test/e2e/fixture/applicationsets/utils/fixture.go Outdated Show resolved Hide resolved
test/e2e/fixture/applicationsets/utils/fixture.go Show resolved Hide resolved
test/e2e/fixture/applicationsets/utils/fixture.go

if msg == "" {
msg = err.Error()
for _, namespace := range []string{string(ApplicationsResourcesNamespace), string(ArgoCDExternalNamespace), string(ArgoCDExternalNamespace2)} {
Copy link
Member

Choose a reason for hiding this comment

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

Can we use fixtureClient.ExternalAppSetClientsets instead of creating a new list to loop over?

ishitasequeira
ishitasequeira approved these changes Nov 5, 2023
View reviewed changes
Copy link
Member

@ishitasequeira ishitasequeira left a comment

Choose a reason for hiding this comment

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

Approving the change to get into 2.9.0 GA

@ishitasequeira
Update test/e2e/fixture/applicationsets/utils/fixture.go
d74abc0 
Signed-off-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>
@ishitasequeira ishitasequeira enabled auto-merge (squash) November 5, 2023 23:02
@speedfl
Copy link
Contributor Author

speedfl commented Nov 5, 2023

Wow so fast! Thanks a lot @ishitasequeira and @crenshaw-dev 🙂

@ishitasequeira ishitasequeira merged commit 3c9a1ec into argoproj:master Nov 6, 2023
25 checks passed
jmilic1 pushed a commit to jmilic1/argo-cd that referenced this pull request Nov 13, 2023
@speedfl @ishitasequeira @jmilic1
fix(appset): Fix name conflict in appset controller (argoproj#16207) (a…
9ce5116 
…rgoproj#16222)

* fix(16207): Fix name conflict in appset controller

Signed-off-by: gmuselli <geoffrey.muselli@gmail.com>

* fix(16207): e2e

Signed-off-by: gmuselli <geoffrey.muselli@gmail.com>

* Update test/e2e/fixture/applicationsets/utils/fixture.go

Signed-off-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>

---------

Signed-off-by: gmuselli <geoffrey.muselli@gmail.com>
Signed-off-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>
Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>
Signed-off-by: jmilic1 <70441727+jmilic1@users.noreply.github.com>
vladfr pushed a commit to vladfr/argo-cd that referenced this pull request Dec 13, 2023
@speedfl @ishitasequeira @vladfr
fix(appset): Fix name conflict in appset controller (argoproj#16207) (a…
45b03af 
…rgoproj#16222)

* fix(16207): Fix name conflict in appset controller

Signed-off-by: gmuselli <geoffrey.muselli@gmail.com>

* fix(16207): e2e

Signed-off-by: gmuselli <geoffrey.muselli@gmail.com>

* Update test/e2e/fixture/applicationsets/utils/fixture.go

Signed-off-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>

---------

Signed-off-by: gmuselli <geoffrey.muselli@gmail.com>
Signed-off-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>
Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>
tesla59 pushed a commit to tesla59/argo-cd that referenced this pull request Dec 16, 2023
@speedfl @ishitasequeira @tesla59
fix(appset): Fix name conflict in appset controller (argoproj#16207) (a…
bcae4be 
…rgoproj#16222)

* fix(16207): Fix name conflict in appset controller

Signed-off-by: gmuselli <geoffrey.muselli@gmail.com>

* fix(16207): e2e

Signed-off-by: gmuselli <geoffrey.muselli@gmail.com>

* Update test/e2e/fixture/applicationsets/utils/fixture.go

Signed-off-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>

---------

Signed-off-by: gmuselli <geoffrey.muselli@gmail.com>
Signed-off-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>
Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>
lyda pushed a commit to lyda/argo-cd that referenced this pull request Mar 28, 2024
@speedfl @ishitasequeira @lyda
fix(appset): Fix name conflict in appset controller (argoproj#16207) (a…
908b2ee 
…rgoproj#16222)

* fix(16207): Fix name conflict in appset controller

Signed-off-by: gmuselli <geoffrey.muselli@gmail.com>

* fix(16207): e2e

Signed-off-by: gmuselli <geoffrey.muselli@gmail.com>

* Update test/e2e/fixture/applicationsets/utils/fixture.go

Signed-off-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>

---------

Signed-off-by: gmuselli <geoffrey.muselli@gmail.com>
Signed-off-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>
Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>
Signed-off-by: Kevin Lyda <kevin@lyda.ie>
Hariharasuthan99 pushed a commit to AmadeusITGroup/argo-cd that referenced this pull request Jun 16, 2024
@speedfl @ishitasequeira @Hariharasuthan99
fix(appset): Fix name conflict in appset controller (argoproj#16207) (a…
8a87dda 
…rgoproj#16222)

* fix(16207): Fix name conflict in appset controller

Signed-off-by: gmuselli <geoffrey.muselli@gmail.com>

* fix(16207): e2e

Signed-off-by: gmuselli <geoffrey.muselli@gmail.com>

* Update test/e2e/fixture/applicationsets/utils/fixture.go

Signed-off-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>

---------

Signed-off-by: gmuselli <geoffrey.muselli@gmail.com>
Signed-off-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>
Co-authored-by: Ishita Sequeira <46771830+ishitasequeira@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@crenshaw-dev crenshaw-dev crenshaw-dev left review comments

@ishitasequeira ishitasequeira ishitasequeira approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.9
3 participants
@speedfl @crenshaw-dev @ishitasequeira