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

Allow passing in custom pod anti-affinity, as well as pod affinity #495

Merged
merged 6 commits into from
Dec 20, 2023
Merged

Allow passing in custom pod anti-affinity, as well as pod affinity #495

merged 6 commits into from
Dec 20, 2023

Conversation

emmahsax
Copy link
Contributor

@emmahsax emmahsax commented Nov 4, 2023

Description

This change allows people to pass in both pod affinity as well as custom pod anti-affinity (which will ignore the default hard and soft anti-affinity currently present in this helm chart).

To use the customAntiAffinity, antiAffinity must be set to custom, otherwise the default soft affinity will be used. If antiAffinity is set to custom, but nothing is specified in customAntiAffinity, then {} will be used for anti-affinity.

Issues Resolved

This change will resolve #397.

Check List

  • Commits are signed per the DCO using --signoff

For any changes to files within Helm chart directories:

  • Helm chart version bumped
  • Helm chart CHANGELOG.md updated to reflect change

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@emmahsax
Copy link
Contributor Author

emmahsax commented Nov 4, 2023

I'm not sure if I'm supposed to manually update the CHANGELOG.md, or if that's auto-generated. If it needs to be manual, let me know and I can update that.

@prudhvigodithi
Copy link
Collaborator

Hey @emmahsax, apologies for the delay, yes the changelog needs to be updated? Here is the sample merged Pull request https://github.com/opensearch-project/helm-charts/pull/482/files.

emmahsax and others added 4 commits December 13, 2023 13:23
Updating URL

Allow custom anti-affinity

Add a custom option

Haha oops

Empty commit

Try to version bump to a custom version

Maybe this will work

Use lower chart

Try this

Now that I know all tests pass, try to go back to 0.0.1

Put all of these back

Signed-off-by: Emma Sax <sax.emma.h@gmail.com>
Signed-off-by: Divya Madala <divyaasm@amazon.com>
Signed-off-by: Emma Sax <sax.emma.h@gmail.com>
Signed-off-by: Emma Sax <sax.emma.h@gmail.com>
Signed-off-by: Emma Sax <sax.emma.h@gmail.com>
@emmahsax
Copy link
Contributor Author

@prudhvigodithi Thanks. The Changelog is updated. I also synced my branch with the latest from main so that it updates to a newer version.

@prudhvigodithi
Copy link
Collaborator

Thanks @emmahsax, Since this is a not the OpenSerach version upgrade can you please change this to 2.17.1 (I will try to document this versioning in the contribution guidelines as well). Also please update the [Unreleased] section in the changelog file, example https://github.com/opensearch-project/helm-charts/pull/506/files.

Signed-off-by: Emma Sax <sax.emma.h@gmail.com>
Signed-off-by: Emma Sax <sax.emma.h@gmail.com>
@emmahsax
Copy link
Contributor Author

@prudhvigodithi Thanks! Complete.

@prudhvigodithi
Copy link
Collaborator

LGTM. @TheAlgo @peterzhuamazon can you please check?

@prudhvigodithi prudhvigodithi merged commit 0a4b05b into opensearch-project:main Dec 20, 2023
8 checks passed
@emmahsax emmahsax deleted the add_affinity_options branch December 21, 2023 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Enhancement][opensearch] Allow overriding affinity definition
3 participants