Merge pull request #30 from ialidzhikov/enh/pin-fluentd

Pin fluentd version
gardener · Dec 13, 2019 · c031e1d · c031e1d
2 parents 02d1fa6 + 915d6bf
commit c031e1d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,20 @@
+**What this PR does / why we need it**:
+
+**Which issue(s) this PR fixes**:
+Fixes #
+
+**Special notes for your reviewer**:
+
+**Release note**:
+<!--  Write your release note:
+1. Enter your release note in the below block.
+2. If no release note is required, just write "NONE" within the block.
+
+Format of block header: <category> <target_group>
+Possible values:
+- category:       improvement|noteworthy|action
+- target_group:   user|operator|developer
+-->
+```improvement operator
+
+```
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -1,4 +1,2 @@
 # logging maintainers
-*   @vlvasilev
-*   @ialidzhikov
-*   @vpnachev
+* @vlvasilev @ialidzhikov @vpnachev
diff --git a/curator-es/Dockerfile b/curator-es/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 #############      builder       #############
-FROM golang:1.12.1 AS builder
+FROM golang:1.13.5 AS builder
 
 WORKDIR /go/src/github.com/gardener/logging
 COPY . .

diff --git a/fluentd-es/Gemfile.gardener b/fluentd-es/Gemfile.gardener
@@ -1,3 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'fluentd', '<=1.4.2'
+gem 'fluent-plugin-elasticsearch', '~>3.4.3'
 gem 'fluent-plugin-rewrite-tag-filter', '~>2.1.0'
+gem 'fluent-plugin-systemd', '~>1.0.2'