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
29eb6020
Commit
29eb6020
authored
Mar 04, 2016
by
Alex Robinson
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #22074 from a-robinson/images
Update the logging images to parse sub-second docker timestamps.
parents
18d8e7b7
feea376b
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
5 deletions
+5
-5
Makefile
...er/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+1
-1
Makefile
cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
+1
-1
fluentd-es.yaml
cluster/saltbase/salt/fluentd-es/fluentd-es.yaml
+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-elasticsearch/fluentd-es-image/Makefile
View file @
29eb6020
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
.PHONY
:
build push
.PHONY
:
build push
IMAGE
=
fluentd-elasticsearch
IMAGE
=
fluentd-elasticsearch
TAG
=
1.1
4
TAG
=
1.1
5
build
:
build
:
docker build
-t
gcr.io/google_containers/
$(IMAGE)
:
$(TAG)
.
docker build
-t
gcr.io/google_containers/
$(IMAGE)
:
$(TAG)
.
...
...
cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
View file @
29eb6020
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
.PHONY
:
kbuild kpush
.PHONY
:
kbuild kpush
TAG
=
1.1
6
TAG
=
1.1
7
# 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-es/fluentd-es.yaml
View file @
29eb6020
...
@@ -8,7 +8,7 @@ metadata:
...
@@ -8,7 +8,7 @@ metadata:
spec
:
spec
:
containers
:
containers
:
-
name
:
fluentd-elasticsearch
-
name
:
fluentd-elasticsearch
image
:
gcr.io/google_containers/fluentd-elasticsearch:1.1
4
image
:
gcr.io/google_containers/fluentd-elasticsearch:1.1
5
resources
:
resources
:
limits
:
limits
:
cpu
:
100m
cpu
:
100m
...
...
cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
View file @
29eb6020
...
@@ -9,7 +9,7 @@ spec:
...
@@ -9,7 +9,7 @@ spec:
dnsPolicy
:
Default
dnsPolicy
:
Default
containers
:
containers
:
-
name
:
fluentd-cloud-logging
-
name
:
fluentd-cloud-logging
image
:
gcr.io/google_containers/fluentd-gcp:1.1
6
image
:
gcr.io/google_containers/fluentd-gcp:1.1
7
resources
:
resources
:
limits
:
limits
:
cpu
:
100m
cpu
:
100m
...
...
docs/getting-started-guides/logging.md
View file @
29eb6020
...
@@ -173,7 +173,7 @@ spec:
...
@@ -173,7 +173,7 @@ spec:
dnsPolicy
:
Default
dnsPolicy
:
Default
containers
:
containers
:
-
name
:
fluentd-cloud-logging
-
name
:
fluentd-cloud-logging
image
:
gcr.io/google_containers/fluentd-gcp:1.1
6
image
:
gcr.io/google_containers/fluentd-gcp:1.1
7
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