mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-31 07:20:13 +00:00
Merge pull request #61885 from kubernetes/revert-61773-fluentd-partial-success
Automatic merge from submit-queue (batch tested with PRs 61930, 61885). 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>. Revert "Enable partial success in fluentd-gcp" Reverts kubernetes/kubernetes#61773 As @Random-Liu noticed in https://github.com/kubernetes/kubernetes/pull/61773#issuecomment-377140834, it broke tests, possibly because of higher memory utilization /assign @x13n ```release-note NONE ```
This commit is contained in:
commit
4d7a20c6d1
@ -402,8 +402,6 @@ data:
|
||||
# the necessary resource types when this label is set.
|
||||
"logging.googleapis.com/k8s_compatibility": "true"
|
||||
}
|
||||
# Only drop failed entries partially, instead of dropping the whole request.
|
||||
partial_success true
|
||||
</match>
|
||||
|
||||
# Keep a smaller buffer here since these logs are less important than the user's
|
||||
@ -432,10 +430,9 @@ data:
|
||||
# the necessary resource types when this label is set.
|
||||
"logging.googleapis.com/k8s_compatibility": "true"
|
||||
}
|
||||
partial_success true
|
||||
</match>
|
||||
metadata:
|
||||
name: fluentd-gcp-config-v1.2.5
|
||||
name: fluentd-gcp-config-v1.2.4
|
||||
namespace: kube-system
|
||||
labels:
|
||||
addonmanager.kubernetes.io/mode: Reconcile
|
||||
|
@ -108,4 +108,4 @@ spec:
|
||||
path: /var/lib/docker/containers
|
||||
- name: config-volume
|
||||
configMap:
|
||||
name: fluentd-gcp-config-v1.2.5
|
||||
name: fluentd-gcp-config-v1.2.4
|
||||
|
Loading…
Reference in New Issue
Block a user