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

Feature/tolerations and node selector inputs #107

Conversation

sepulworld
Copy link
Contributor

Signed-off-by: Zane Williamson [email protected]

Describe your changes
Extending the Custom Options API to include podOptions to support Tolerations and Node Selector inputs for both SolrCloud StatefulSet and PromExporter Deployment

Updated readme NAMESPACE value to include forward slash

Testing performed
Added unit test to validate found and expected Tolerations and Node Selector values

Tested in local docker and dev environment

@sepulworld sepulworld force-pushed the feature/tolerations_and_node_selector_inputs branch from 6f912a5 to e3918e6 Compare April 6, 2020 22:51
Signed-off-by: Zane Williamson <[email protected]>
Copy link
Contributor

@HoustonPutman HoustonPutman left a comment

Choose a reason for hiding this comment

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

requests:
cpu: "65m"
memory: "156Mi"
customSolrKubeOptions:
Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for making this fix, I had a branch that made these changes but I forgot to make a PR.

@sepulworld
Copy link
Contributor Author

Signed-off-by: Zane Williamson <[email protected]>
@sepulworld sepulworld force-pushed the feature/tolerations_and_node_selector_inputs branch from 12816df to 150ae95 Compare April 8, 2020 00:47
@sepulworld
Copy link
Contributor Author

We can make the same changes for the SolrPrometheusExporter. I'd look in these two places:
https://github.com/bloomberg/solr-operator/blob/master/controllers/util/zk_util.go#L383
https://github.com/bloomberg/solr-operator/blob/master/controllers/util/prometheus_exporter_util.go#L219

We can make the same changes for the SolrPrometheusExporter. I'd look in these two places:
https://github.com/bloomberg/solr-operator/blob/master/controllers/util/zk_util.go#L383
https://github.com/bloomberg/solr-operator/blob/master/controllers/util/prometheus_exporter_util.go#L219

I did for prometheus exporter already: https://github.com/bloomberg/solr-operator/pull/107/files#diff-50635f351caf6e78f4f33fec707bd8f4 was there another change for this service I am missing?

Ill look at the zk_util.go and add there.

Ok updated zk_util.go

@HoustonPutman
Copy link
Contributor

Ah can't believe I missed that. I'll try to run this today and try it out! The code looks good to me though

@sepulworld
Copy link
Contributor Author

No problem! Thanks for taking a look! I added a couple tests too

Copy link
Contributor

@HoustonPutman HoustonPutman left a comment

Choose a reason for hiding this comment

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

Great work!

@HoustonPutman HoustonPutman merged commit 6bd5727 into apache:master Apr 8, 2020
@HoustonPutman HoustonPutman deleted the feature/tolerations_and_node_selector_inputs branch April 8, 2020 21:27
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