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(cli): cherrypick Redis password fix #19599 into 2.12 #20262

Merged
merged 2 commits into from
Oct 9, 2024
Merged

fix(cli): cherrypick Redis password fix #19599 into 2.12 #20262

merged 2 commits into from
Oct 9, 2024

Conversation

NetanelK
Copy link
Contributor

@NetanelK NetanelK commented Oct 7, 2024

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.
  • 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.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

@NetanelK NetanelK requested a review from a team as a code owner October 7, 2024 08:13
@NetanelK NetanelK mentioned this pull request Oct 7, 2024
Merged
14 tasks
nitishfy
nitishfy reviewed Oct 7, 2024
View reviewed changes
Copy link
Member

@nitishfy nitishfy left a comment

Choose a reason for hiding this comment

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

Please fix the CI Failures.

@nitishfy nitishfy mentioned this pull request Oct 7, 2024
Merged
14 tasks
@NetanelK
Copy link
Contributor Author

NetanelK commented Oct 7, 2024

@nitishfy @pasha-codefresh cherrypicked #19039 too as a prerequisite for redis fix

@NetanelK NetanelK force-pushed the release-2.12 branch 2 times, most recently from 05241f8 to 2d1e339 Compare October 9, 2024 08:03
@codecov Codecov
Copy link

codecov bot commented Oct 9, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 42.85714% with 12 lines in your changes missing coverage. Please review.

Project coverage is 50.36%. Comparing base (a05b042) to head (91b6cd6).
Report is 1 commits behind head on release-2.12.

Files with missing lines Patch % Lines
cmd/argocd/commands/headless/headless.go 0.00% 6 Missing ⚠️
cmd/argocd/commands/admin/cluster.go 0.00% 2 Missing ⚠️
...md/argocd/commands/admin/redis_initial_password.go 0.00% 2 Missing ⚠️
common/common.go 81.81% 1 Missing and 1 partial ⚠️
Additional details and impacted files 
@@              Coverage Diff              @@
##           release-2.12   #20262   +/-   ##
=============================================
  Coverage         50.35%   50.36%           
=============================================
  Files               313      313           
  Lines             43155    43167   +12     
=============================================
+ Hits              21729    21739   +10     
- Misses            18939    18940    +1     
- Partials           2487     2488    +1

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

@NetanelK NetanelK changed the title fix: cherrypick Redis password fix #19599 into 2.12 fix(cli): cherrypick Redis password fix #19599 into 2.12 Oct 9, 2024
sheikhrachel and others added 2 commits October 9, 2024 12:19
@sheikhrachel @crenshaw-dev @NetanelK
fix(cli): add optional password setting for headless redis client (ar…
3a41c2e 
…goproj#19035) (argoproj#19039)

* chore: add optional password setting for headless redis client

Signed-off-by: Rachel Sheikh <rsheikh@squareup.com>

* fix: remove import cycle

Signed-off-by: Rachel Sheikh <rsheikh@squareup.com>

* fix: add shared SetOptionalRedisPasswordFromKubeConfig method

Signed-off-by: Rachel Sheikh <rsheikh@squareup.com>

* fix: export redis consts

Signed-off-by: Rachel Sheikh <rsheikh@squareup.com>

* test: add test cases for SetOptionalRedisPasswordFromKubeConfig()

Signed-off-by: Rachel Sheikh <rsheikh@squareup.com>

* chore: go mod tidy

Signed-off-by: Rachel Sheikh <rsheikh@squareup.com>

* fix: use require instead of assert

Signed-off-by: Rachel Sheikh <rsheikh@squareup.com>

* fix: Update common/common.go

Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Signed-off-by: Rachel Sheikh <sheikhrachel97@gmail.com>

---------

Signed-off-by: Rachel Sheikh <rsheikh@squareup.com>
Signed-off-by: Rachel Sheikh <sheikhrachel97@gmail.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@NetanelK
fix: Add redis password to forwardCacheClient struct (argoproj#19599)
91b6cd6 
Signed-off-by: Netanel Kadosh <kadoshnetanel@gmail.com>
@pasha-codefresh pasha-codefresh merged commit 3ff57d2 into argoproj:release-2.12 Oct 9, 2024
21 of 22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nitishfy nitishfy nitishfy left review comments

@pasha-codefresh pasha-codefresh pasha-codefresh 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.
4 participants
@NetanelK @pasha-codefresh @nitishfy @sheikhrachel