Merge pull request #42692 from timstclair/fluentd

Automatic merge from submit-queue (batch tested with PRs 42692, 42169, 42173) Bump fluentd-gcp to version 2.0.1 Fixes https://github.com/kubernetes/kubernetes/issues/42515

Merge pull request #42692 from timstclair/fluentd
25317ee8 · Kubernetes Submit Queue · GitHub · bf7f42d3 · 56a7080e · 25317ee8
Commit 25317ee8 authored Mar 07, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 07, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

fluentd-gcp-ds.yaml cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml +1 -1

fluentd-gcp.yaml cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml +1 -1

No files found.
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
@@ -24,7 +24,7 @@ spec:
      dnsPolicy: Default
      containers:
      - name: fluentd-gcp
-        image: gcr.io/google-containers/fluentd-gcp:2.0
+        image: gcr.io/google-containers/fluentd-gcp:2.0.1
        # If fluentd consumes its own logs, the following situation may happen:
        # fluentd fails to send a chunk to the server => writes it to the log =>
        # tries to send this message to the server => fails to send a chunk and so on.

--- a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
+++ b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
@@ -14,7 +14,7 @@ spec:
  dnsPolicy: Default
  containers:
  - name: fluentd-cloud-logging
-    image: gcr.io/google_containers/fluentd-gcp:2.0
+    image: gcr.io/google_containers/fluentd-gcp:2.0.1
    # If fluentd consumes its own logs, the following situation may happen:
    # fluentd fails to send a chunk to the server => writes it to the log =>
    # tries to send this message to the server => fails to send a chunk and so on.