Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
809f4e1b
Commit
809f4e1b
authored
Oct 29, 2015
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #16497 from a-robinson/fluentd
Auto commit by PR queue bot
parents
cd7e4bd6
f0ebe406
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
Makefile
cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
+1
-1
fluentd-gcp.yaml
cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
+1
-1
logging.md
docs/getting-started-guides/logging.md
+1
-1
No files found.
cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
View file @
809f4e1b
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
.PHONY
:
kbuild kpush
.PHONY
:
kbuild kpush
TAG
=
1.1
3
TAG
=
1.1
4
# Rules for building the test image for deployment to Dockerhub with user kubernetes.
# Rules for building the test image for deployment to Dockerhub with user kubernetes.
...
...
cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
View file @
809f4e1b
...
@@ -6,7 +6,7 @@ metadata:
...
@@ -6,7 +6,7 @@ metadata:
spec
:
spec
:
containers
:
containers
:
-
name
:
fluentd-cloud-logging
-
name
:
fluentd-cloud-logging
image
:
gcr.io/google_containers/fluentd-gcp:1.1
3
image
:
gcr.io/google_containers/fluentd-gcp:1.1
4
resources
:
resources
:
limits
:
limits
:
cpu
:
100m
cpu
:
100m
...
...
docs/getting-started-guides/logging.md
View file @
809f4e1b
...
@@ -169,7 +169,7 @@ metadata:
...
@@ -169,7 +169,7 @@ metadata:
spec
:
spec
:
containers
:
containers
:
-
name
:
fluentd-cloud-logging
-
name
:
fluentd-cloud-logging
image
:
gcr.io/google_containers/fluentd-gcp:1.1
3
image
:
gcr.io/google_containers/fluentd-gcp:1.1
4
resources
:
resources
:
limits
:
limits
:
cpu
:
100m
cpu
:
100m
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment