Skip to content

Conversation

@erhhung
Copy link

@erhhung erhhung commented Oct 29, 2025

This PR is a revival or PR #14001 that has gone stale due to lack of follow-up by the original PR contributor @mie00. I have applied the original PR changes, rebased against the master branch, and changed the new CLI parameter and environment variable names to be consistent with existing names.

To re-iterate, this PR adds support for Redis running in cluster mode by:

  • referencing instantiated Redis client using the redis.UniversalClient interface abstraction
  • introducing new --redis-cluster-mode CLI parameter and REDIS_CLUSTER_MODE environment variable (true/false) to use redis.ClusterClient instead of redis.Client
  • updating base manifests to set REDIS_CLUSTER_MODE environment variable using the redis.cluster.mode value in the argocd-cmd-params-cm ConfigMap

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 Title of the PR
  • 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).
mie00 and others added 5 commits August 8, 2023 17:28
Signed-off-by: Mohamed Elawadi <mohamed@elawadi.net>
Signed-off-by: Mohamed Elawadi <mohamed@elawadi.net>
Signed-off-by: Mohamed Elawadi <mohamed@elawadi.net>
Signed-off-by: Mohamed Elawadi <mohamed@elawadi.net>
@erhhung erhhung requested review from a team as code owners October 29, 2025 21:40
@bunnyshell
Copy link

bunnyshell bot commented Oct 29, 2025

🔴 Preview Environment stopped on Bunnyshell

See: Environment Details | Pipeline Logs

Available commands (reply to this comment):

  • 🔵 /bns:start to start the environment
  • 🚀 /bns:deploy to redeploy the environment
  • /bns:delete to remove the environment
…ter mode

Signed-off-by: Erhhung Yuan <erhhung@gmail.com>
…rs for Redis cluster mode

Signed-off-by: Erhhung Yuan <erhhung@gmail.com>
@erhhung erhhung requested a review from a team as a code owner October 29, 2025 22:40
fad3t and others added 14 commits October 29, 2025 17:30
Signed-off-by: Frederic Mereu <frederic.mereu@gaming1.com>
Signed-off-by: Erhhung Yuan <erhhung@gmail.com>
…havior (argoproj#25024)

Signed-off-by: Nitish Kumar <justnitish06@gmail.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Regina Voloshin <regina.voloshin@codefresh.io>
Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
Signed-off-by: shota3506 <s.shota.710.3506@gmail.com>
Signed-off-by: Erhhung Yuan <erhhung@gmail.com>
…rgoproj#24717)

Signed-off-by: choejwoo <jaewoo45@gmail.com>
Signed-off-by: Erhhung Yuan <erhhung@gmail.com>
…dd08f76 (argoproj#25073)

Signed-off-by: renovate[bot] <renovate[bot]@users.noreply.github.com>
Co-authored-by: argoproj-renovate[bot] <161757507+argoproj-renovate[bot]@users.noreply.github.com>
…proj#25086)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…oj#25085)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…bac879 (argoproj#25091)

Signed-off-by: renovate[bot] <renovate[bot]@users.noreply.github.com>
Co-authored-by: argoproj-renovate[bot] <161757507+argoproj-renovate[bot]@users.noreply.github.com>
…rgoproj#25099)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Afzal Ansari <afzal442@gmail.com>
…roj#25068)

Signed-off-by: Josh Soref <jsoref@gmail.com>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: Yusuke Abe <chansuke0@gmail.com>
Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
Signed-off-by: Jonathan Winters <wintersjonathan0@gmail.com>
Co-authored-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
Signed-off-by: Erhhung Yuan <erhhung@gmail.com>
@erhhung erhhung force-pushed the redis-cluster branch 2 times, most recently from ff1901a to 5258c09 Compare October 30, 2025 00:53
Signed-off-by: Frederic Mereu <frederic.mereu@gaming1.com>
Signed-off-by: Erhhung Yuan <erhhung@gmail.com>
dependabot bot and others added 8 commits October 29, 2025 18:25
…proj#25086)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…oj#25085)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…bac879 (argoproj#25091)

Signed-off-by: renovate[bot] <renovate[bot]@users.noreply.github.com>
Co-authored-by: argoproj-renovate[bot] <161757507+argoproj-renovate[bot]@users.noreply.github.com>
Signed-off-by: Erhhung Yuan <erhhung@gmail.com>
…rgoproj#25099)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Afzal Ansari <afzal442@gmail.com>
…roj#25068)

Signed-off-by: Josh Soref <jsoref@gmail.com>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: Yusuke Abe <chansuke0@gmail.com>
Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
Signed-off-by: Jonathan Winters <wintersjonathan0@gmail.com>
Co-authored-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
Signed-off-by: Erhhung Yuan <erhhung@gmail.com>
@codecov
Copy link

codecov bot commented Oct 30, 2025

Codecov Report

❌ Patch coverage is 33.89831% with 39 lines in your changes missing coverage. Please review.
✅ Project coverage is 62.18%. Comparing base (e80395b) to head (599a1f7).
⚠️ Report is 6 commits behind head on master.

Files with missing lines Patch % Lines
util/cache/cache.go 26.00% 34 Missing and 3 partials ⚠️
cmd/argocd-server/commands/argocd_server.go 0.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #25115      +/-   ##
==========================================
- Coverage   62.29%   62.18%   -0.11%     
==========================================
  Files         351      351              
  Lines       49213    49253      +40     
==========================================
- Hits        30656    30629      -27     
- Misses      15640    15687      +47     
- Partials     2917     2937      +20     

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

fad3t and others added 15 commits October 29, 2025 21:15
Signed-off-by: Frederic Mereu <frederic.mereu@gaming1.com>
Signed-off-by: Erhhung Yuan <erhhung@gmail.com>
…havior (argoproj#25024)

Signed-off-by: Nitish Kumar <justnitish06@gmail.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Regina Voloshin <regina.voloshin@codefresh.io>
Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
Signed-off-by: shota3506 <s.shota.710.3506@gmail.com>
Signed-off-by: Erhhung Yuan <erhhung@gmail.com>
…rgoproj#24717)

Signed-off-by: choejwoo <jaewoo45@gmail.com>
Signed-off-by: Erhhung Yuan <erhhung@gmail.com>
…dd08f76 (argoproj#25073)

Signed-off-by: renovate[bot] <renovate[bot]@users.noreply.github.com>
Co-authored-by: argoproj-renovate[bot] <161757507+argoproj-renovate[bot]@users.noreply.github.com>
Signed-off-by: Erhhung Yuan <erhhung@gmail.com>
…proj#25086)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…oj#25085)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…bac879 (argoproj#25091)

Signed-off-by: renovate[bot] <renovate[bot]@users.noreply.github.com>
Co-authored-by: argoproj-renovate[bot] <161757507+argoproj-renovate[bot]@users.noreply.github.com>
Signed-off-by: Erhhung Yuan <erhhung@gmail.com>
…rgoproj#25099)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Afzal Ansari <afzal442@gmail.com>
…roj#25068)

Signed-off-by: Josh Soref <jsoref@gmail.com>
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
Co-authored-by: Yusuke Abe <chansuke0@gmail.com>
Signed-off-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
Signed-off-by: Jonathan Winters <wintersjonathan0@gmail.com>
Co-authored-by: Alexander Matyushentsev <AMatyushentsev@gmail.com>
Signed-off-by: Erhhung Yuan <erhhung@gmail.com>
Signed-off-by: Erhhung Yuan <erhhung@gmail.com>
@erhhung
Copy link
Author

erhhung commented Oct 30, 2025

Sorry about all the duplicate rebase commits—didn't want to risk any issues by dropping any from history, so please perform a squash merge if the PR is acceptable.

Copy link
Contributor

@todaywasawesome todaywasawesome left a comment

Choose a reason for hiding this comment

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

Can you sign all your commits? I also think you might need to bring a cleaner commit history here, it makes these more difficult to review an introduces risk.

I suggest starting with a new branch and applying your changes there first so you can bring in a clean history.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet