Skip to content

K
k3s
Unverified Commit eae4c989 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #58224 from zombiezen/patch-1

Automatic merge from submit-queue (batch tested with PRs 56408, 58224, 58160). 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>. Bump fluentd-gcp version **What this PR does / why we need it**: Addresses issues parsing exceptions from logs **Release note**: ```release-note fluentd-gcp updated to version 2.0.14. ```
parents 8ae388e9 6831581f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View file @ eae4c989
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: fluentd-gcp-v2.0.13 name: fluentd-gcp-v2.0.14
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: fluentd-gcp k8s-app: fluentd-gcp
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
version: v2.0.13 version: v2.0.14
spec: spec:
updateStrategy: updateStrategy:
type: RollingUpdate type: RollingUpdate
...@@ -16,7 +16,7 @@ spec: ...@@ -16,7 +16,7 @@ spec:
labels: labels:
k8s-app: fluentd-gcp k8s-app: fluentd-gcp
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v2.0.13 version: v2.0.14
# This annotation ensures that fluentd does not get evicted if the node # This annotation ensures that fluentd does not get evicted if the node
# supports critical pod annotation based priority scheme. # supports critical pod annotation based priority scheme.
# Note that this does not guarantee admission on the nodes (#40573). # Note that this does not guarantee admission on the nodes (#40573).
...@@ -27,7 +27,7 @@ spec: ...@@ -27,7 +27,7 @@ spec:
dnsPolicy: Default dnsPolicy: Default
containers: containers:
- name: fluentd-gcp - name: fluentd-gcp
image: gcr.io/google-containers/fluentd-gcp:2.0.13 image: gcr.io/google-containers/fluentd-gcp:2.0.14
env: env:
- name: FLUENTD_ARGS - name: FLUENTD_ARGS
value: --no-supervisor -q value: --no-supervisor -q
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment