Merge pull request #40353 from Crassirostris/fluentd-config-timestamp-fix

Automatic merge from submit-queue

Fix fluentd-gcp configuration to handle different timezones on the node

Fix https://github.com/kubernetes/kubernetes/issues/40226

Probably a bug in the fluentd configuration

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

@@ -2,23 +2,23 @@
 apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
-  name: fluentd-gcp-v1.34
+  name: fluentd-gcp-v1.35
   namespace: kube-system
   labels:
     k8s-app: fluentd-gcp
     kubernetes.io/cluster-service: "true"
-    version: v1.34
+    version: v1.35
 spec:
   template:
     metadata:
       labels:
         k8s-app: fluentd-gcp
         kubernetes.io/cluster-service: "true"
-        version: v1.34
+        version: v1.35
     spec:
       containers:
       - name: fluentd-gcp
-        image: gcr.io/google_containers/fluentd-gcp:1.34
+        image: gcr.io/google_containers/fluentd-gcp:1.35
         # 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.

cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile

@@ -26,7 +26,7 @@
 .PHONY:	build push
 
 PREFIX=gcr.io/google_containers
-TAG = 1.34
+TAG = 1.35
 
 build:
 	docker build --pull -t $(PREFIX)/fluentd-gcp:$(TAG) .

cluster/addons/fluentd-gcp/fluentd-gcp-image/fluent.conf

@@ -54,7 +54,7 @@
   time_key time
   path /var/log/containers/*.log
   pos_file /var/log/gcp-containers.log.pos
-  time_format %Y-%m-%dT%H:%M:%S.%NZ
+  time_format %Y-%m-%dT%H:%M:%S.%N%Z
   tag reform.*
   read_from_head true
 </source>

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

@@ -10,7 +10,7 @@ spec:
   dnsPolicy: Default
   containers:
   - name: fluentd-cloud-logging
-    image: gcr.io/google_containers/fluentd-gcp:1.34
+    image: gcr.io/google_containers/fluentd-gcp:1.35
     # 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.