From 915d6bf60e1d80f37f0fe7693ee59fdbd2f02984 Mon Sep 17 00:00:00 2001 From: ialidzhikov Date: Fri, 13 Dec 2019 15:34:00 +0200 Subject: [PATCH] Pin fluentd version Signed-off-by: ialidzhikov --- .github/pull_request_template.md | 20 ++++++++++++++++++++ CODEOWNERS | 4 +--- curator-es/Dockerfile | 2 +- fluentd-es/Gemfile.gardener | 3 +++ 4 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000..b578f8f6 --- /dev/null +++ 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**: + +```improvement operator + +``` diff --git a/CODEOWNERS b/CODEOWNERS index 8559e320..4f267edf 100644 --- 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 index a0586ac8..26599936 100644 --- 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 index d3f8b7e7..9326b67c 100644 --- 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'