github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16497 from a-robinson/fluentd

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-10-29 06:01:20 -07:00
commit 809f4e1bc3
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

@ -14,7 +14,7 @@
.PHONY: kbuild kpush
TAG = 1.13
TAG = 1.14
# Rules for building the test image for deployment to Dockerhub with user kubernetes.

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

@ -6,7 +6,7 @@ metadata:
spec:
containers:
- name: fluentd-cloud-logging
image: gcr.io/google_containers/fluentd-gcp:1.13
image: gcr.io/google_containers/fluentd-gcp:1.14
resources:
limits:
cpu: 100m

2
docs/getting-started-guides/logging.md
View File

@ -169,7 +169,7 @@ metadata:
spec:
containers:
- name: fluentd-cloud-logging
image: gcr.io/google_containers/fluentd-gcp:1.13
image: gcr.io/google_containers/fluentd-gcp:1.14
resources:
limits:
cpu: 100m