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: check for double definition cherry-pick release-2.8 #16435

Merged
merged 1 commit into from
Nov 28, 2023
Merged

fix: check for double definition cherry-pick release-2.8 #16435

merged 1 commit into from
Nov 28, 2023

Conversation

blakepettersson
Copy link
Member

It appears as if the cherry-pick of #15670 into release-2.8 only picked the unit test, but not the changes in state.go.

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.

@blakepettersson
fix: check for double definition
94ebe9a 
A simpler fix - don't add a managed namespace to the targetObjs list if
a namespace already exists in the application source.

Signed-off-by: Blake Pettersson <[email protected]>
@blakepettersson
Copy link
Member Author

@ishitasequeira this is the same weirdness as in #16335 😄

@blakepettersson blakepettersson changed the title fix: check for double definition cherry-pick release-2.8 fix: #15670 cherry-pick release-2.8 Nov 23, 2023
@blakepettersson blakepettersson changed the title fix: #15670 cherry-pick release-2.8 fix: check for double definition cherry-pick release-2.8 Nov 23, 2023
ishitasequeira
ishitasequeira approved these changes Nov 28, 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.

Thanks @blakepettersson for catching this!! 😄

@ishitasequeira ishitasequeira merged commit b84b143 into argoproj:release-2.8 Nov 28, 2023
17 of 21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ishitasequeira ishitasequeira ishitasequeira approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@blakepettersson @ishitasequeira