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

Feature - Add nodeSelector, affinity and tolerations to daemonset and deployment templates #456

Merged
merged 5 commits into from
Dec 4, 2018
Merged

Feature - Add nodeSelector, affinity and tolerations to daemonset and deployment templates #456

merged 5 commits into from
Dec 4, 2018

Conversation

Dean-Coakley
Copy link
Contributor

@Dean-Coakley Dean-Coakley commented Dec 1, 2018 •
edited
Loading

Fixes: #444

Proposed changes

  • Add nodeSelector support to deployment template
  • Add affinity support to daemonset and deployment templates
  • Tolerations changed to be more flexible. Can now be used in deployments and daemonsets that are not deployed to ICP
  • Improved formatting of values-icp.yaml

Checklist

Before creating a PR, run through this checklist and mark each as complete.

  • I have read the CONTRIBUTING doc
  • I have added tests that prove my fix is effective or that my feature works
  • I have checked that all unit tests pass after adding my changes
  • I have updated necessary documentation
  • I have rebased my branch onto master
  • I will ensure my PR is targeting the master branch and pulling from my branch from my own fork

@Dean-Coakley
Add nodeSelector, affinity, tolerations support
9e21bd5 
* Add nodeSelector support to deployment template
* Add affinity support to daemonset and deployment templates
* Tolerations changed to be more flexible. Can now be used in
deployments and daemonsets that are not deployed on IBM icp
@Dean-Coakley
Increment helm chart version
7d420c8
@Dean-Coakley
Helm: Update readme with affinities, tolerations
b485cba 
Signed-off-by: Dean Coakley <dean.s.coakley@gmail.com>
@Dean-Coakley
Fix icp-values.yaml formatting
9326ba0
@Dean-Coakley Dean-Coakley added enhancement Pull requests for new features/feature enhancements change Pull requests that introduce a change labels Dec 1, 2018
@Dean-Coakley Dean-Coakley self-assigned this Dec 1, 2018
pleshakov
pleshakov suggested changes Dec 3, 2018
View reviewed changes
Copy link
Contributor

@pleshakov pleshakov left a comment

Choose a reason for hiding this comment

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

thanks. please see a few request changes.

deployments/helm-chart/README.md Outdated Show resolved Hide resolved
deployments/helm-chart/README.md Outdated Show resolved Hide resolved
deployments/helm-chart/templates/controller-daemonset.yaml Outdated Show resolved Hide resolved
@Dean-Coakley
Fix helm documentation. Remove trimSuffix
8e4062e 
* Simplify documentation of affinity and tolerations in the helm chart.
* trimSuffix removes a trailing newline produced by toYaml. This newline is harmless, and trimSuffix was
inconsistent with the rest of the templates. So it was removed.
@Dean-Coakley Dean-Coakley merged commit aef7fa3 into master Dec 4, 2018
@Dean-Coakley Dean-Coakley deleted the feature/helm-selector-affinity-tolerations branch December 4, 2018 14:39
@Dean-Coakley Dean-Coakley mentioned this pull request Dec 4, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@isaachawley isaachawley isaachawley approved these changes

@pleshakov pleshakov pleshakov approved these changes

Assignees

@Dean-Coakley Dean-Coakley

Labels
change Pull requests that introduce a change enhancement Pull requests for new features/feature enhancements
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

nodeSelector, nodeAffinity and tolerations support in helm chart
3 participants
@Dean-Coakley @isaachawley @pleshakov