Skip to content

Commit

Permalink
Merge pull request #62076 from qingling128/master
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Add support to ingest log entries to Stackdriver against new "k8s_container" and "k8s_node" resources.

**What this PR does / why we need it**:

**Which issue(s) this PR fixes**
Fluentd 0.14 has some memory leak issues that caused the e2e tests to be flaky. Downgrading to v0.12.

**Special notes for your reviewer**:
We never released any previous version with Fluentd v0.14. Only upgraded it very recently. So this downgrading is not visible to users.

**Release note**:
```release-note
Add support to ingest log entries to Stackdriver against new "k8s_container" and "k8s_node" resources.
```
  • Loading branch information
Kubernetes Submit Queue authored Apr 6, 2018
2 parents 5fa4f2f + cbec62a commit 4009cb3
Show file tree
Hide file tree
Showing 6 changed files with 564 additions and 67 deletions.
Loading

0 comments on commit 4009cb3

Please sign in to comment.