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.

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

refactor: upgrade redis-ha to 4.12.14 & cleanup generate.sh #6021

Merged
merged 1 commit into from
Apr 15, 2021

Conversation

aniekgul
Copy link
Contributor

Following this upstream redis-ha PR all the required configurations set using sed in the generate script can now be set via the chart's values.

Signed-off-by: Aniek Gul aniekgul@hotmail.com

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

@codecov
Copy link

codecov bot commented Apr 12, 2021

Codecov Report

Merging #6021 (d09aaea) into master (61080b3) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #6021   +/-   ##
=======================================
  Coverage   40.93%   40.93%           
=======================================
  Files         147      147           
  Lines       19661    19661           
=======================================
  Hits         8049     8049           
  Misses      10508    10508           
  Partials     1104     1104           

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 61080b3...d09aaea. Read the comment docs.

@aniekgul aniekgul marked this pull request as draft April 12, 2021 18:18
@aniekgul aniekgul marked this pull request as ready for review April 12, 2021 19:33
Copy link
Member

@jannfis jannfis left a comment

Choose a reason for hiding this comment

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

Thank you @aniekgul, I think this is a great change. Removing some dirty hacks from our manifest generation sounds like a good idea.

Can you please resolve the merge conflict?

Signed-off-by: Aniek Gul <aniekgul@hotmail.com>
@aniekgul
Copy link
Contributor Author

@jannfis fixed the conflict. Unfortunately the new sentinel bind conf will have to be stay as a hack but I can take a look at adding support for it in the upstream chart later.

Copy link
Member

@jannfis jannfis left a comment

Choose a reason for hiding this comment

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

Thank you @aniekgul! Much appreciated!

LGTM.

@jannfis jannfis merged commit d78af0b into argoproj:master Apr 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants