github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-27 12:31:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37021 from Crassirostris/fluentd-image-version-bump

Browse Source 
Automatic merge from submit-queue

Bump fluentd-gcp image version

To propagate https://github.com/kubernetes/kubernetes/pull/36993

Including release noted for the whole bunch of fluentd changes (https://github.com/kubernetes/kubernetes/pull/35618 mainly):

```release-note
Default logging subsystem's resiliency was greatly improved, fluentd memory consumption and OOM error probability was reduced.
```

@piosz
This commit is contained in:
Kubernetes Submit Queue 2016-11-17 13:52:02 -08:00 committed by GitHub
commit 0664405954
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
View File

@ -29,7 +29,7 @@
.PHONY: build push
PREFIX=gcr.io/google_containers
TAG = 1.26
TAG = 1.27
build:
docker build -t $(PREFIX)/fluentd-gcp:$(TAG) .

2
cluster/saltbase/salt/fluentd-gcp-gci/fluentd-gcp-gci.yaml
View File

@ -11,7 +11,7 @@ spec:
dnsPolicy: Default
containers:
- name: fluentd-cloud-logging
image: gcr.io/google_containers/fluentd-gcp:1.26
image: gcr.io/google_containers/fluentd-gcp:1.27
command:
- '/bin/sh'
- '-c'

2
cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
View File

@ -11,7 +11,7 @@ spec:
dnsPolicy: Default
containers:
- name: fluentd-cloud-logging
image: gcr.io/google_containers/fluentd-gcp:1.26
image: gcr.io/google_containers/fluentd-gcp:1.27
resources:
limits:
memory: 200Mi