diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile index 45ba669e9ae..a6dfb10d272 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile @@ -32,12 +32,13 @@ COPY Gemfile /Gemfile SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"] +# hadolint ignore=DL3008,DL3028 RUN apt-get update && \ apt-get install -y --no-install-recommends g++ gcc make && \ + rm -rf /var/lib/apt/lists/* && \ echo 'gem: --no-document' >> /etc/gemrc && \ gem install --file Gemfile - FROM ruby:2.7-slim-buster ARG DEBIAN_FRONTEND=noninteractive @@ -49,10 +50,11 @@ COPY --from=builder /usr/local/bundle/ /usr/local/bundle SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"] +# hadolint ignore=DL3008 RUN apt-get update && \ apt-get install -y --no-install-recommends libjemalloc2 && \ apt-get clean -y && \ - ulimit -n 65536 && \ + ulimit -n 65536 && \ rm -rf \ /var/cache/debconf/* \ /var/lib/apt/lists/* \ @@ -63,7 +65,5 @@ RUN apt-get update && \ # Expose prometheus metrics. EXPOSE 80 -ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2 - # Start Fluentd to pick up our config that watches Docker container logs. CMD ["/entrypoint.sh"] diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile index cdbdeea9763..89de25dc645 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Gemfile @@ -1,14 +1,13 @@ source 'https://rubygems.org' -gem 'activesupport', '6.0.3.4' -gem 'elasticsearch-xpack', '7.9.0' -gem 'fluentd', '1.11.4' +gem 'activesupport', '6.1.1' +gem 'elasticsearch-xpack', '7.10.1' +gem 'fluentd', '1.12.0' gem 'fluent-plugin-concat', '2.4.0' gem 'fluent-plugin-detect-exceptions', '0.0.13' -gem 'fluent-plugin-elasticsearch', '4.2.2' -gem 'fluent-plugin-kubernetes_metadata_filter', '2.5.2' +gem 'fluent-plugin-elasticsearch', '4.3.3' +gem 'fluent-plugin-kubernetes_metadata_filter', '2.6.0' gem 'fluent-plugin-multi-format-parser', '1.0.0' -gem 'fluent-plugin-prometheus', '1.8.4' +gem 'fluent-plugin-prometheus', '1.8.5' gem 'fluent-plugin-systemd', '1.0.2' -gem 'oj', '3.10.15' - +gem 'oj', '3.11.0' diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile index 11fae71fc64..8808db0bffe 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile @@ -16,7 +16,7 @@ PREFIX = quay.io/fluentd_elasticsearch IMAGE = fluentd -TAG = v3.1.0 +TAG = v3.2.0 build: docker build --tag ${PREFIX}/${IMAGE}:${TAG} . diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/entrypoint.sh b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/entrypoint.sh index d501cb8f9ff..c7b4157ccbc 100755 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/entrypoint.sh +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2017 The Kubernetes Authors. # @@ -20,6 +20,13 @@ # For systems without journald mkdir -p /var/log/journal +# set ld preload +if dpkg --print-architecture | grep -q amd64;then + export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2 +else + export LD_PRELOAD=/usr/lib/aarch64-linux-gnu/libjemalloc.so.2 +fi + # Use exec to get the signal # A non-quoted string and add the comment to prevent shellcheck failures on this line. # See https://github.com/koalaman/shellcheck/wiki/SC2086