add option to include tolerations to daemonset #1364

ag237 · 2017-06-23T15:36:11Z

Occasionally pods need to run on the master nodes, and with Kubernetes 1.6.x there are taints on these nodes that prevent sumokube from running there and grabbing logs. This adds the option to add those tolerations to the daemonset.

I'm not sure on protocol for updating version number, so I left it alone.

k8s-ci-robot · 2017-06-23T15:36:13Z

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://github.com/kubernetes/kubernetes/wiki/CLA-FAQ to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
If you signed the CLA as a corporation, please sign in with your organization's credentials at https://identity.linuxfoundation.org/projects/cncf to be authorized.
If you have done the above and are still having issues with the CLA being reported as unsigned, please email the CNCF helpdesk: helpdesk@rt.linuxfoundation.org

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

k8s-ci-robot · 2017-06-23T15:36:20Z

Hi @ag237. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

vreon · 2017-06-23T20:54:30Z

stable/sumokube/README.md

@@ -54,6 +54,7 @@ The following tables lists the configurable parameters of the Sumokube chart and
 | `resources.limits.cpu`      | CPU resource limits                | 256m                                     |
 | `resources.requests.memory` | Memory resource requests           | 128Mi                                      |
 | `resources.limits.memory`   | Memory resource limits             | 256Mi                                      |
+| `daemonsets.tolerations     | List of node taints to tolerate (requires Kubernetes >= 1.6)            | `Nil` You must provide your own tolerations        |


Looks like this should be daemonset rather than daemonsets

unguiculus

Thanks. Just a small correction.

unguiculus · 2017-06-24T15:57:52Z

stable/sumokube/templates/daemonset.yaml

@@ -61,4 +61,8 @@ spec:
      - name: sumo-sources
        configMap:
          name: "{{ template "fullname" . }}-config-{{.Release.Time.Seconds }}"
+      {{- if .Values.daemonset.tolerations }}


Remove if statement.

unguiculus · 2017-06-24T15:59:09Z

stable/sumokube/values.yaml

@@ -29,3 +29,7 @@ resources:
  limits:
    cpu: 256m
    memory: 256Mi
+


Comment these lines in after removing the ifstatement.

daemonset: tolerations: []

unguiculus · 2017-06-24T16:01:32Z

stable/sumokube/README.md

@@ -54,6 +54,7 @@ The following tables lists the configurable parameters of the Sumokube chart and
 | `resources.limits.cpu`      | CPU resource limits                | 256m                                     |
 | `resources.requests.memory` | Memory resource requests           | 128Mi                                      |
 | `resources.limits.memory`   | Memory resource limits             | 256Mi                                      |
+| `daemonsets.tolerations     | List of node taints to tolerate (requires Kubernetes >= 1.6)            | `Nil` You must provide your own tolerations        |


[] instead of 'Nil You must provide your own tolerations'

unguiculus · 2017-06-24T16:02:26Z

/ok-to-test

ag237 · 2017-06-26T13:40:07Z

Made requested changes.

unguiculus · 2017-06-28T10:16:11Z

/cc @seanknox @jdumars

DStorck · 2017-06-29T23:37:38Z

stable/sumokube/README.md

@@ -54,6 +54,7 @@ The following tables lists the configurable parameters of the Sumokube chart and
 | `resources.limits.cpu`      | CPU resource limits                | 256m                                     |
 | `resources.requests.memory` | Memory resource requests           | 128Mi                                      |
 | `resources.limits.memory`   | Memory resource limits             | 256Mi                                      |
+| `daemonset.tolerations      | List of node taints to tolerate (requires Kubernetes >= 1.6)            | []    |


missing the closing `

Thanks, fixed.

* upstream/master: (67 commits) Fix json whitespace (helm#1458) Use consistent whitespace in template placeholders (helm#1437) [stable/selenium] Make hub readiness probe timeout configurable (helm#1391) [stable/kube2iam]: add rbac support (helm#1286) [stable/traefik] Allow enabling traefik access logs (helm#1302) Add Stash chart (helm#1420) Add Gearman G2 chart (helm#1421) add option to include tolerations to daemonset (helm#1364) Moved Artifactory to stable and updated version to 5.3.2 (helm#1314) Concourse postgres conditional dependency (helm#1390) Typo in helm install command for dask-distributed (helm#1413) [stable/fluent-bit] Fluent Bit v0.11.12 (helm#1417) fixed cassandra chart's persistence bug (helm#1245) Prometheus: modify config to support k8s 1.6 by default (helm#1080) Add rocket.chat (helm#752) Fix influxdb deployment (helm#1424) feat(stable/etcd-operator): add support for supplying additional command args (helm#1418) add configurable service annotations helm#1234 (helm#1244) [stable/prometheus] extra environment variable for alert manager (helm#1237) [stable/heapster] Default service name to Heapster (helm#1266) ...

k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 23, 2017

ag237 closed this Jun 23, 2017

ag237 reopened this Jun 23, 2017

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Jun 23, 2017

vreon reviewed Jun 23, 2017

View reviewed changes

unguiculus suggested changes Jun 24, 2017

View reviewed changes

unguiculus reviewed Jun 24, 2017

View reviewed changes

unguiculus self-assigned this Jun 24, 2017

k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 24, 2017

ag237 force-pushed the master branch 2 times, most recently from d666bae to 1e6416f Compare June 26, 2017 13:39

k8s-ci-robot requested review from jdumars and seanknox June 28, 2017 10:16

unguiculus approved these changes Jun 28, 2017

View reviewed changes

ag237 force-pushed the master branch from 1e6416f to eadbd35 Compare June 28, 2017 15:57

DStorck reviewed Jun 29, 2017

View reviewed changes

ag237 force-pushed the master branch from eadbd35 to 5eacee2 Compare July 6, 2017 12:44

add option to include tolerations to daemonset

f184712

ag237 force-pushed the master branch from 5eacee2 to f184712 Compare July 6, 2017 12:46

unguiculus added code reviewed size/small lgtm Indicates that a PR is ready to be merged. labels Jul 6, 2017

unguiculus merged commit 7efd8f2 into helm:master Jul 6, 2017

yanns pushed a commit to yanns/charts that referenced this pull request Jul 28, 2017

add option to include tolerations to daemonset (helm#1364)

109e363

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add option to include tolerations to daemonset #1364

add option to include tolerations to daemonset #1364

ag237 commented Jun 23, 2017

k8s-ci-robot commented Jun 23, 2017

k8s-ci-robot commented Jun 23, 2017

vreon Jun 23, 2017

unguiculus left a comment

unguiculus Jun 24, 2017

unguiculus Jun 24, 2017

unguiculus Jun 24, 2017

unguiculus commented Jun 24, 2017

ag237 commented Jun 26, 2017

unguiculus commented Jun 28, 2017

DStorck Jun 29, 2017

ag237 Jul 6, 2017

add option to include tolerations to daemonset #1364

add option to include tolerations to daemonset #1364

Conversation

ag237 commented Jun 23, 2017

k8s-ci-robot commented Jun 23, 2017

k8s-ci-robot commented Jun 23, 2017

vreon Jun 23, 2017

Choose a reason for hiding this comment

unguiculus left a comment

Choose a reason for hiding this comment

unguiculus Jun 24, 2017

Choose a reason for hiding this comment

unguiculus Jun 24, 2017

Choose a reason for hiding this comment

unguiculus Jun 24, 2017

Choose a reason for hiding this comment

unguiculus commented Jun 24, 2017

ag237 commented Jun 26, 2017

unguiculus commented Jun 28, 2017

DStorck Jun 29, 2017

Choose a reason for hiding this comment

ag237 Jul 6, 2017

Choose a reason for hiding this comment