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: use serviceaccount name instead of struct #9614

Merged
merged 2 commits into from
Jun 8, 2022
Merged

fix: use serviceaccount name instead of struct #9614

merged 2 commits into from
Jun 8, 2022

Conversation

danielhelfand
Copy link
Contributor

@danielhelfand danielhelfand commented Jun 8, 2022 •
edited
Loading

Minor cleanup of #9546. Should use ServiceAccount name in error message instead of whole struct. Also changing name of param from sa to serviceAccount since other funcs have sa param as string to avoid confusion. Should be cherry-picked into 2.4.

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

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).
  • 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).

@danielhelfand
fix: use serviceaccount name instead of struct
9b46f9c 
Signed-off-by: Daniel Helfand <helfand.4@gmail.com>
@danielhelfand danielhelfand marked this pull request as ready for review June 8, 2022 19:03
@danielhelfand
fix: change name of param from sa to serviceAccount
b9e949a 
Signed-off-by: Daniel Helfand <helfand.4@gmail.com>
crenshaw-dev
crenshaw-dev approved these changes Jun 8, 2022
View reviewed changes
Copy link
Member

@crenshaw-dev crenshaw-dev left a comment

Choose a reason for hiding this comment

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

Good catch!

@crenshaw-dev crenshaw-dev enabled auto-merge (squash) June 8, 2022 19:25
@crenshaw-dev crenshaw-dev added the cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch label Jun 8, 2022
@codecov
Copy link

codecov bot commented Jun 8, 2022

Codecov Report

Merging #9614 (b9e949a) into master (8a1d9fe) will not change coverage.
The diff coverage is 72.72%.

@@           Coverage Diff           @@
##           master    #9614   +/-   ##
=======================================
  Coverage   45.90%   45.90%           
=======================================
  Files         222      222           
  Lines       26461    26461           
=======================================
  Hits        12146    12146           
  Misses      12658    12658           
  Partials     1657     1657
Impacted Files Coverage Δ
util/clusterauth/clusterauth.go 68.32% <72.72%> (ø)
util/settings/settings.go 48.16% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8a1d9fe...b9e949a. Read the comment docs.

@crenshaw-dev crenshaw-dev merged commit 73d01b3 into argoproj:master Jun 8, 2022
danielhelfand added a commit to danielhelfand/argo-cd that referenced this pull request Jun 8, 2022
@danielhelfand
fix: use serviceaccount name instead of struct (argoproj#9614)
36cd9f2 
* fix: use serviceaccount name instead of struct

Signed-off-by: Daniel Helfand <helfand.4@gmail.com>

* fix: change name of param from sa to serviceAccount

Signed-off-by: Daniel Helfand <helfand.4@gmail.com>
@danielhelfand danielhelfand mentioned this pull request Jun 8, 2022
Merged
10 tasks
crenshaw-dev pushed a commit that referenced this pull request Jun 8, 2022
@danielhelfand
fix: use serviceaccount name instead of struct (#9614) (#9617)
da8e7b9 
* fix: use serviceaccount name instead of struct

Signed-off-by: Daniel Helfand <helfand.4@gmail.com>

* fix: change name of param from sa to serviceAccount

Signed-off-by: Daniel Helfand <helfand.4@gmail.com>
@crenshaw-dev crenshaw-dev added the cherry-pick/2.3 Candidate for cherry picking into the 2.3 release branch label Jul 13, 2022
crenshaw-dev pushed a commit that referenced this pull request Jul 13, 2022
@danielhelfand @crenshaw-dev
fix: use serviceaccount name instead of struct (#9614)
d0e30d9 
* fix: use serviceaccount name instead of struct

Signed-off-by: Daniel Helfand <helfand.4@gmail.com>

* fix: change name of param from sa to serviceAccount

Signed-off-by: Daniel Helfand <helfand.4@gmail.com>
@crenshaw-dev
Copy link
Member

Cherry-picked onto release-2.3 for 2.3.7.

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 approved these changes

Assignees
No one assigned
Labels
cherry-pick/2.3 Candidate for cherry picking into the 2.3 release branch cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@danielhelfand @crenshaw-dev