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

Add generic NoSchedule toleration to fluentd in gcp config as a quick… #48182

Merged
merged 1 commit into from
Jun 28, 2017
Merged

Add generic NoSchedule toleration to fluentd in gcp config as a quick… #48182

merged 1 commit into from
Jun 28, 2017
+3 −0

Conversation

gmarek
Copy link
Contributor

@gmarek gmarek commented Jun 28, 2017 •
edited by enisoc
Loading

…-fix for #44445

Add generic NoSchedule toleration to fluentd in gcp config.

@gmarek gmarek added the release-note-none Denotes a PR that doesn't merit a release note. label Jun 28, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 28, 2017
@k8s-github-robot k8s-github-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 28, 2017
@gmarek
Copy link
Contributor Author

gmarek commented Jun 28, 2017

This will need to be cherry-picked to both 1.6 and 1.7 @dchen1107 @ethernetdan @enisoc

@crassirostris
Copy link

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 28, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: crassirostris, gmarek

Associated issue: 44445

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 28, 2017
@gmarek
Copy link
Contributor Author

gmarek commented Jun 28, 2017

/test pull-kubernetes-e2e-gce-etcd3

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 48192, 48182)

@k8s-github-robot k8s-github-robot merged commit ec729ad into kubernetes:master Jun 28, 2017
@enisoc enisoc mentioned this pull request Jun 28, 2017
Closed
This was referenced Jun 29, 2017
Merged
Merged
@enisoc enisoc added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Jun 29, 2017
k8s-github-robot pushed a commit that referenced this pull request Jun 29, 2017
Merge pull request #48246 from gmarek/automated-cherry-pick-of-#48182…
83c8ab9 
…-upstream-release-1.6

Automatic merge from submit-queue

Automated cherry pick of #48182

Cherry pick of #48182 on release-1.6.

#48182: Add generic NoSchedule toleration to fluentd in gcp config as
```release-note
Add generic NoSchedule toleration to fluentd in gcp
```
@crassirostris crassirostris mentioned this pull request Jun 30, 2017
Closed
@caesarxuchao caesarxuchao added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherrypick-candidate labels Jul 6, 2017
@caesarxuchao caesarxuchao added this to the v1.7 milestone Jul 6, 2017
k8s-github-robot pushed a commit that referenced this pull request Jul 12, 2017
Merge pull request #48248 from gmarek/automated-cherry-pick-of-#48182…
05e9e47 
…-upstream-release-1.7

Automatic merge from submit-queue

Automated cherry pick of #48182

Cherry pick of #48182 on release-1.7.

#48182: Add generic NoSchedule toleration to fluentd in gcp config as

```release-note
Add generic NoSchedule toleration to fluentd in gcp
```
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.7" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@crassirostris crassirostris

@mikedanese mikedanese

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.
8 participants
@gmarek @crassirostris @k8s-github-robot @k8s-cherrypick-bot @mikedanese @caesarxuchao @enisoc @k8s-ci-robot