Merge branch 'main' into mounted-file-conf-reload

.github/workflows/build-workflow.yaml

@@ -1,7 +1,12 @@
 name: build-workflow
 # This workflow is triggered on pushes to the repository.
-on: push
-
+on: 
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
 jobs:
   build:
     name: build-job
@@ -12,17 +17,12 @@ jobs:
         with:
           version: "v0.9.0"
       - uses: FranzDiebold/[email protected]
-      - name: install-helm
+      - name: lint-test-config-reloader
         run: |
-          wget https://get.helm.sh/helm-v3.5.0-linux-amd64.tar.gz -O /tmp/helm-v3.5.0-linux-amd64.tar.gz
-          mkdir /tmp/bin -p; tar xzf /tmp/helm-v3.5.0-linux-amd64.tar.gz -C /tmp/bin --strip-components=1;
-          PATH=/tmp/bin:$PATH
+          cd config-reloader && make test
       - name: build-base-image
         run: |
           cd base-image && make
-      - name: lint-test-config-reloader
-        run: |
-          cd config-reloader && make test
       - name: build-config-reloader
         run: |
           cd config-reloader && make build-image TAG=v$GITHUB_SHA_SHORT

.github/workflows/release-workflow.yaml

@@ -28,6 +28,7 @@ jobs:
   release:
     name: create-release
     runs-on: ubuntu-latest
+    needs: publish
     container:
       image: alpine/helm
     steps:

CHANGELOG.md

@@ -1,5 +1,29 @@
 # CHANGELOG
 
+## [v1.16.8](https://github.com/vmware/kube-fluentd-operator/releases/tag/v1.16.8)
+
+#### Core:
+  - feat: move constructor to the top #356 (@javiercri)
+  - feat: change actions trigger #357 (@javiercri)
+  - feat: golang refactor for config-reloader #348 (@javiercri)
+  - Discover namespaces with fluentdconfig too if migration mode is enabled #310 (@jonasrutishauser)
+  - README: Missing . in label expansion #351 (@djdillon)
+  - feat: add missing prometheus metrics #342 (@javiercri)
+  - chore(deps): bump google-protobuf from 3.21.5 to 3.21.7 in /base-image by @dependabot in #340
+
+#### Plugins:
+  - Feat: update fluentd and dependencies #355 (@slimm609)
+  - feat: add support for throttle plugin #341 (@javiercri)
+  - update dependencies for fluentd 1.15 #338 (@slimm609)
+  - update fluentd to v1.15.0 #337 (@yuzs2)
+#### Helm:
+  - None
+
+#### CI:
+  - feat: generate release after publish images #344 (@javiercri)
+  - Add automatic releases to Github actions #330 (@gga-kialo)
+
+
 ## [v1.16.7](https://github.com/vmware/kube-fluentd-operator/releases/tag/v1.16.7)
 
 #### Core:

README.md

@@ -22,18 +22,18 @@ The easiest way to get started is using the Helm chart. Official images are not
 git clone [email protected]:vmware/kube-fluentd-operator.git
 helm install kfo ./kube-fluentd-operator/charts/log-router \
   --set rbac.create=true \
-  --set image.tag=v1.16.7 \
+  --set image.tag=v1.16.8 \
   --set image.repository=vmware/kube-fluentd-operator
 ```
 
 Alternatively, deploy the Helm chart from a Github release:
 
 ```bash
-CHART_URL='https://github.com/vmware/kube-fluentd-operator/releases/download/v1.16.7/log-router-0.4.0.tgz'
+CHART_URL='https://github.com/vmware/kube-fluentd-operator/releases/download/v1.16.8/log-router-0.4.0.tgz'
 
 helm install kfo ${CHART_URL} \
   --set rbac.create=true \
-  --set image.tag=v1.16.7 \
+  --set image.tag=v1.16.8 \
   --set image.repository=vmware/kube-fluentd-operator
 ```
 
@@ -279,7 +279,7 @@ This label `$labels(_container=nginx-ingress-controller)` will filter by contain
 
 This label `$labels(app.kubernetes.io/name=nginx-ingress, _container=nginx-ingress-controller)` converts to this `kube.testing.*.nginx-ingress-controller._labels.*.nginx_ingress`.
 
-This label `$labels(app.kubernetes.io/name=nginx-ingress)` converts to this `$labels(kube.testing*.*._labels.*.nginx_ingress)`.
+This label `$labels(app.kubernetes.io/name=nginx-ingress)` converts to this `$labels(kube.testing.*.*._labels.*.nginx_ingress)`.
 
 This fluentd configmap in the `testing` namespace:
 
@@ -654,37 +654,38 @@ This projects tries to keep up with major releases for [Fluentd docker image](ht
 | 1.14.4                     | 1.16.5                  |
 | 1.14.6                     | 1.16.6                  |
 | 1.14.6                     | 1.16.7                  |
+| 1.15.3                     | 1.16.8                  |
 ## Plugins in latest release (1.16.7)
 
 `kube-fluentd-operator` aims to be easy to use and flexible. It also favors sending logs to multiple destinations using `<copy>` and as such comes with many plugins pre-installed:
 
-* fluentd (1.14.4)
+* fluentd (1.15.3)
 * fluent-config-regexp-type (1.0.0)
 * fluent-mixin-config-placeholders (0.4.0)
 * fluent-plugin-amqp (0.14.0)
 * fluent-plugin-azure-loganalytics (0.7.0)
-* fluent-plugin-cloudwatch-logs (0.14.2)
+* fluent-plugin-cloudwatch-logs (0.14.3)
 * fluent-plugin-concat (2.5.0)
-* fluent-plugin-datadog (0.14.0)
+* fluent-plugin-datadog (0.14.2)
 * fluent-plugin-detect-exceptions (0.0.14) - forked to allow fluentd v1 plugin api
-* fluent-plugin-elasticsearch (5.1.0)
+* fluent-plugin-elasticsearch (5.2.4)
+* fluent-plugin-opensearch (1.0.9)
 * fluent-plugin-gelf-hs (1.0.8)
 * fluent-plugin-google-cloud (0.13.0) - forked to allow fluentd v1.14.x
-* fluent-plugin-grafana-loki (1.2.16)
+* fluent-plugin-grafana-loki (1.2.19)
 * fluent-plugin-grok-parser (2.6.2)
 * fluent-plugin-json-in-json-2 (1.0.2)
-* fluent-plugin-kafka (0.17.2)
-* fluent-plugin-kinesis (3.4.1)
+* fluent-plugin-kafka (0.18.1)
+* fluent-plugin-kinesis (3.4.2)
 * fluent-plugin-kubernetes (0.3.1)
-* fluent-plugin-kubernetes_metadata_filter (2.10.0)
+* fluent-plugin-kubernetes_metadata_filter (2.13.0)
 * fluent-plugin-kubernetes_sumologic (2.4.2)
 * fluent-plugin-logentries (0.2.10)
 * fluent-plugin-loggly (1.0.0) - forked to fix for new fluentd api
-* fluent-plugin-logzio (0.0.21)
+* fluent-plugin-logzio (0.0.22)
 * fluent-plugin-mail (0.3.0)
 * fluent-plugin-mongo (1.5.0)
 * fluent-plugin-multi-format-parser (1.0.0)
-* fluent-plugin-mysqlslowquery (0.0.9)
 * fluent-plugin-out-http (1.3.3)
 * fluent-plugin-papertrail (0.2.8)
 * fluent-plugin-prometheus (2.0.2)
@@ -694,16 +695,18 @@ This projects tries to keep up with major releases for [Fluentd docker image](ht
 * fluent-plugin-remote_syslog (1.0.0)
 * fluent-plugin-rewrite-tag-filter (2.4.0)
 * fluent-plugin-route (1.0.0)
-* fluent-plugin-s3 (1.6.1)
+* fluent-plugin-s3 (1.7.2)
 * fluent-plugin-secure-forward (0.4.5)
-* fluent-plugin-splunkhec (2.1)
-* fluent-plugin-splunk-hec (1.2.10)
+* fluent-plugin-splunk-hec (1.3.1)
+* fluent-plugin-splunkhec (2.3)
 * fluent-plugin-sumologic_output (1.7.2)
 * fluent-plugin-systemd (1.0.5)
 * fluent-plugin-uri-parser (0.3.0)
 * fluent-plugin-verticajson (0.0.6)
+* fluent-plugin-vmware-loginsight (1.3.1)
 * fluent-plugin-vmware-log-intelligence (2.0.6)
-* fluent-plugin-vmware-loginsight (1.0.0)
+* fluent-plugin-mysqlslowquery (0.0.9)
+* fluent-plugin-throttle (0.0.5)
 * fluent-plugin-webhdfs (1.5.0)
 
 When customizing the image be careful not to uninstall plugins that are used internally to implement the macros.

base-image/Dockerfile

@@ -3,7 +3,7 @@
 # Similar to https://github.com/drecom/docker-centos-ruby/blob/2.6.5-slim/Dockerfile
 
 ARG RVM_PATH=/usr/local/rvm
-ARG RUBY_VERSION=ruby-2.7.6
+ARG RUBY_VERSION=ruby-2.7.7
 ARG RUBY_PATH=/usr/local/rvm/rubies/$RUBY_VERSION
 ARG RUBYOPT='-W:no-deprecated -W:no-experimental'
 
@@ -57,7 +57,7 @@ RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import \
     && rvm requirements \
     && rvm install --disable-binary $RUBY_VERSION --default \
     && gem update --system --no-document \
-    && gem install bundler -v '>= 2.3.22' --default --no-document \
+    && gem install bundler -v '>= 2.3.26' --default --no-document \
     && bundler install \
     && gem uninstall bundler \
     && gem uninstall rake -v 13.0.6 \
@@ -117,7 +117,7 @@ RUN mkdir -p /fluentd/log /fluentd/etc /fluentd/plugins /usr/local/bundle/bin/ \
   && cd /fluentd \
   && bundle install \
   && cd /fluentd \
-  && git clone https://github.com/Cryptophobia/fluent-plugin-detect-exceptions.git fluent-plugin-detect-exceptions \
+  && git clone https://github.com/slimm609/fluent-plugin-detect-exceptions.git fluent-plugin-detect-exceptions \
   && cd fluent-plugin-detect-exceptions \
   && gem build fluent-plugin-detect-exceptions.gemspec \
   && gem install fluent-plugin-detect-exceptions-*.gem \
@@ -129,17 +129,17 @@ RUN mkdir -p /fluentd/log /fluentd/etc /fluentd/plugins /usr/local/bundle/bin/ \
   && gem install fluent-plugin-google-cloud-*.gem \
   && rm -rf /fluentd/fluent-plugin-google-cloud \
   && cd /fluentd \
-  && git clone https://github.com/Cryptophobia/fluent-plugin-loggly.git fluent-plugin-loggly \
+  && git clone https://github.com/slimm609/fluent-plugin-loggly.git fluent-plugin-loggly \
   && cd fluent-plugin-loggly \
   && gem build fluent-plugin-loggly.gemspec \
   && gem install fluent-plugin-loggly-*.gem \
   && rm -rf /fluentd/fluent-plugin-loggly \
-  && wget https://github.com/jemalloc/jemalloc/releases/download/3.6.0/jemalloc-3.6.0.tar.bz2 -P /tmp \
-  && tar -C /tmp/ -xjvf /tmp/jemalloc-3.6.0.tar.bz2 \
-  && cd /tmp/jemalloc-3.6.0 \
+  && wget https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2 -P /tmp \
+  && tar -C /tmp/ -xjvf /tmp/jemalloc-5.3.0.tar.bz2 \
+  && cd /tmp/jemalloc-5.3.0 \
   && ./configure && make \
   && mv -v lib/libjemalloc.so* /usr/lib \
-  && rm -rf /tmp/jemalloc-3.6.0 /tmp/jemalloc-3.6.0.tar.bz2 \
+  && rm -rf /tmp/jemalloc-5.3.0 /tmp/jemalloc-5.3.0.tar.bz2 \
   && cd /fluentd \
   && gem sources --clear-all \
   && ln -s $(which fluentd) /usr/local/bundle/bin/fluentd \
@@ -150,7 +150,7 @@ RUN mkdir -p /fluentd/log /fluentd/etc /fluentd/plugins /usr/local/bundle/bin/ \
   && gem cleanup \
   && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/cache $RUBY_PATH/lib/ruby/gems/2.7.0/doc/ /usr/share/doc /root/.bundle/cache
 
-# Make sure fluentd picks jemalloc 3.6.0 lib as default
+# Make sure fluentd picks jemalloc 5.3.0 lib as default
 ENV LD_PRELOAD="/usr/lib/libjemalloc.so"
 
 EXPOSE 24444 5140

base-image/Gemfile

@@ -1,18 +1,19 @@
 source "https://rubygems.org"
 
 # pin fluentd, probably a good idea to pin all gems
-gem "fluentd", "1.15.0"
+gem "fluentd", "1.15.3"
 
-gem 'oj', '3.13.10'
+gem 'oj', '3.13.23'
 gem 'ffi'
 gem 'fluent-plugin-amqp', "0.14.0"
 gem 'fluent-plugin-azure-loganalytics', "0.7.0"
 gem 'fluent-plugin-cloudwatch-logs', "0.14.3"
 gem 'fluent-plugin-concat', "2.5.0"
 gem 'fluent-plugin-datadog', "0.14.2"
-gem 'fluent-plugin-elasticsearch', "5.2.3"
+gem 'fluent-plugin-elasticsearch', "5.2.4"
+gem 'fluent-plugin-opensearch', "1.0.9"
 gem 'fluent-plugin-gelf-hs', "1.0.8"
-gem 'fluent-plugin-grafana-loki', "1.2.18"
+gem 'fluent-plugin-grafana-loki', "1.2.19"
 gem 'fluent-plugin-grok-parser', "2.6.2"
 gem 'fluent-plugin-json-in-json-2', "1.0.2"
 gem 'fluent-plugin-kafka', "0.18.1"
@@ -34,14 +35,14 @@ gem 'fluent-plugin-redis', "0.3.5"
 gem 'fluent-plugin-remote_syslog', "1.0.0"
 gem 'fluent-plugin-rewrite-tag-filter', "2.4.0"
 gem 'fluent-plugin-route', "1.0.0"
-gem 'fluent-plugin-s3', "1.7.1"
-gem 'fluent-plugin-splunk-hec', "1.3.0"
-gem 'fluent-plugin-splunkhec', "2.2"
+gem 'fluent-plugin-s3', "1.7.2"
+gem 'fluent-plugin-splunk-hec', "1.3.1"
+gem 'fluent-plugin-splunkhec', "2.3"
 gem 'fluent-plugin-sumologic_output', "1.7.3"
 gem 'fluent-plugin-systemd', "1.0.5"
 gem 'fluent-plugin-uri-parser', "0.3.0"
 gem 'fluent-plugin-verticajson', "0.0.6"
-gem 'fluent-plugin-vmware-loginsight', "1.3.0"
+gem 'fluent-plugin-vmware-loginsight', "1.3.1"
 gem 'fluent-plugin-vmware-log-intelligence', "2.0.6"
 # fluent-plugin-mysqlslowquery is dependency for fluent-plugin-vmware-log-intelligence
 gem 'fluent-plugin-mysqlslowquery', "0.0.9"