Merge pull request #68920 from qingling128/master

Enable insertId generation, and update Stackdriver Logging Agent image to 0.5-1.5.36-1-k8s.

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

@@ -374,6 +374,12 @@ data:
       @type null
     </match>
 
+    # Add a unique insertId to each log entry that doesn't already have it.
+    # This helps guarantee the order and prevent log duplication.
+    <filter **>
+      @type add_insert_ids
+    </filter>
+
     # This section is exclusive for k8s_container logs. These logs come with
     # 'stderr'/'stdout' tags.
     # We use a separate output stanza for 'k8s_node' logs with a smaller buffer

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

@@ -100,13 +100,6 @@ spec:
       # END_PROMETHEUS_TO_SD
       nodeSelector:
         beta.kubernetes.io/fluentd-ds-ready: "true"
-      tolerations:
-      - key: "node.alpha.kubernetes.io/ismaster"
-        effect: "NoSchedule"
-      - operator: "Exists"
-        effect: "NoExecute"
-      - operator: "Exists"
-        effect: "NoSchedule"
       terminationGracePeriodSeconds: 60
       volumes:
       - name: varlog