github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #45715 from gmarek/fluentd_toleration

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 45691, 45667, 45698, 45715)

Add general NoExecute Toleration to fluentd in gcp configuration

Ref #44445

Once merged I'll create a cherry-pick that will be picked up in GKE together with the next patch release.

cc @JorritSalverda @davidopp @aveshagarwal @nimeshksingh @piosz 

```release-note
fluentd will tolerate all NoExecute Taints when run in gcp configuration.
```
This commit is contained in:
Kubernetes Submit Queue 2017-05-12 04:09:45 -07:00 committed by GitHub
commit b58a1b5601
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View File

@ -103,6 +103,8 @@ spec:
tolerations: tolerations:
- key: "node.alpha.kubernetes.io/ismaster" - key: "node.alpha.kubernetes.io/ismaster"
effect: "NoSchedule" effect: "NoSchedule"
- operator: "Exists"
effect: "NoExecute"
terminationGracePeriodSeconds: 30 terminationGracePeriodSeconds: 30
volumes: volumes:
- name: varlog - name: varlog