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
61a709a7
Commit
61a709a7
authored
Aug 17, 2018
by
André Bauer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed json logging in fluentd-elasticsearch image
parent
de1656ab
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
fluentd-es-ds.yaml
cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
+5
-5
Gemfile
...ter/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile
+1
-1
Makefile
...er/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
+1
-1
No files found.
cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
View file @
61a709a7
...
@@ -48,24 +48,24 @@ roleRef:
...
@@ -48,24 +48,24 @@ roleRef:
apiVersion
:
apps/v1
apiVersion
:
apps/v1
kind
:
DaemonSet
kind
:
DaemonSet
metadata
:
metadata
:
name
:
fluentd-es-v2.
2
.0
name
:
fluentd-es-v2..0
namespace
:
kube-system
namespace
:
kube-system
labels
:
labels
:
k8s-app
:
fluentd-es
k8s-app
:
fluentd-es
version
:
v2.
2.0
version
:
v2.
3.1
kubernetes.io/cluster-service
:
"
true"
kubernetes.io/cluster-service
:
"
true"
addonmanager.kubernetes.io/mode
:
Reconcile
addonmanager.kubernetes.io/mode
:
Reconcile
spec
:
spec
:
selector
:
selector
:
matchLabels
:
matchLabels
:
k8s-app
:
fluentd-es
k8s-app
:
fluentd-es
version
:
v2.
2.0
version
:
v2.
3.1
template
:
template
:
metadata
:
metadata
:
labels
:
labels
:
k8s-app
:
fluentd-es
k8s-app
:
fluentd-es
kubernetes.io/cluster-service
:
"
true"
kubernetes.io/cluster-service
:
"
true"
version
:
v2.
2.0
version
:
v2.
3.1
# This annotation ensures that fluentd does not get evicted if the node
# This annotation ensures that fluentd does not get evicted if the node
# supports critical pod annotation based priority scheme.
# supports critical pod annotation based priority scheme.
# Note that this does not guarantee admission on the nodes (#40573).
# Note that this does not guarantee admission on the nodes (#40573).
...
@@ -77,7 +77,7 @@ spec:
...
@@ -77,7 +77,7 @@ spec:
serviceAccountName
:
fluentd-es
serviceAccountName
:
fluentd-es
containers
:
containers
:
-
name
:
fluentd-es
-
name
:
fluentd-es
image
:
k8s.gcr.io/fluentd-elasticsearch:v2.
2.0
image
:
k8s.gcr.io/fluentd-elasticsearch:v2.
3.1
env
:
env
:
-
name
:
FLUENTD_ARGS
-
name
:
FLUENTD_ARGS
value
:
--no-supervisor -q
value
:
--no-supervisor -q
...
...
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile
View file @
61a709a7
...
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
...
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
gem
'fluentd'
,
'<=1.2.4'
gem
'fluentd'
,
'<=1.2.4'
gem
'activesupport'
,
'~>5.2.1'
gem
'activesupport'
,
'~>5.2.1'
gem
'fluent-plugin-kubernetes_metadata_filter'
,
'~>2.
1.2
'
gem
'fluent-plugin-kubernetes_metadata_filter'
,
'~>2.
0.0
'
gem
'fluent-plugin-elasticsearch'
,
'~>2.11.5'
gem
'fluent-plugin-elasticsearch'
,
'~>2.11.5'
gem
'fluent-plugin-systemd'
,
'~>1.0.1'
gem
'fluent-plugin-systemd'
,
'~>1.0.1'
gem
'fluent-plugin-detect-exceptions'
,
'~>0.0.11'
gem
'fluent-plugin-detect-exceptions'
,
'~>0.0.11'
...
...
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
View file @
61a709a7
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
PREFIX
=
staging-k8s.gcr.io
PREFIX
=
staging-k8s.gcr.io
IMAGE
=
fluentd-elasticsearch
IMAGE
=
fluentd-elasticsearch
TAG
=
v2.3.
0
TAG
=
v2.3.
1
build
:
build
:
docker build
--pull
-t
$(PREFIX)
/
$(IMAGE)
:
$(TAG)
.
docker build
--pull
-t
$(PREFIX)
/
$(IMAGE)
:
$(TAG)
.
...
...
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