Merge pull request #26783 from a-robinson/newlogs

Automatic merge from submit-queue

Add collection of the new glbc and cluster-autoscaler logs

I've incremented the version numbers by 2 to avoid conflicting with #26652. I'll make sure the potential conflict between the images gets resolved reasonably.

cc @piosz @bprashanth @aledbf
This commit is contained in:
k8s-merge-robot
2016-06-04 07:35:33 -07:00
6 changed files with 61 additions and 8 deletions

View File

@@ -8,7 +8,7 @@ metadata:
spec:
containers:
- name: fluentd-elasticsearch
image: gcr.io/google_containers/fluentd-elasticsearch:1.15
image: gcr.io/google_containers/fluentd-elasticsearch:1.17
resources:
limits:
memory: 200Mi

View File

@@ -9,7 +9,7 @@ spec:
dnsPolicy: Default
containers:
- name: fluentd-cloud-logging
image: gcr.io/google_containers/fluentd-gcp:1.18
image: gcr.io/google_containers/fluentd-gcp:1.20
resources:
limits:
memory: 200Mi