chore(fluentd): upgrade fluentd v1.13.3 and gems

- upgrade `fluentd` gem to new minor release [v1.13.3](https://github.com/fluent/fluentd/blob/master/CHANGELOG.md#v1133) - upgrade other non-pegged gems in Gemfile.lock Signed-off-by: Anton Ouzounov <[email protected]>
vmware · Jul 30, 2021 · 4f390a5 · 4f390a5
1 parent f2e7a54
commit 4f390a5
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -543,6 +543,7 @@ This projects tries to keep up with major releases for [Fluentd docker image](ht
 | 1.12.3                     | 1.14.1                  |
 | 1.13.0                     | 1.15.0                  |
 | 1.13.1                     | 1.15.1                  |
+| 1.13.3                     | 1.15.2 (TBA)            |
 
 ## Plugins in latest release (1.15.1)
 

diff --git a/base-image/Dockerfile b/base-image/Dockerfile
@@ -48,7 +48,7 @@ RUN git clone git://github.com/rbenv/ruby-build.git $RUBY_PATH/plugins/ruby-buil
     && gem update --system --no-document \
     && gem install bundler -v '>= 2.2.24' --default --no-document \
     && gem install rexml -v '>= 3.2.5' --default --no-document \
-    && gem install rdoc -v '>= 6.3.1' --default --no-document \
+    && gem install rdoc -v '>= 6.3.2' --default --no-document \
     && bundler install \
     && gem uninstall rake -v 13.0.3 \
     && gem uninstall bigdecimal \

diff --git a/base-image/Gemfile b/base-image/Gemfile
@@ -1,9 +1,10 @@
 source "https://rubygems.org"
 
 # pin fluentd, probably a good idea to pin all gems
-gem "fluentd", "~> 1.13.2"
+gem "fluentd", "~> 1.13.3"
 
-gem 'ffi', "1.15.1"
+gem 'oj', '3.11.0'
+gem 'ffi'
 gem 'fluent-plugin-amqp', "0.14.0"
 gem 'fluent-plugin-azure-loganalytics', "0.7.0"
 gem 'fluent-plugin-cloudwatch-logs', "0.14.0"

diff --git a/base-image/Gemfile.lock b/base-image/Gemfile.lock
@@ -15,30 +15,30 @@ GEM
     amq-protocol (2.3.2)
     attr_required (1.0.1)
     aws-eventstream (1.1.1)
-    aws-partitions (1.479.0)
-    aws-sdk-cloudwatchlogs (1.41.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-partitions (1.482.0)
+    aws-sdk-cloudwatchlogs (1.42.0)
+      aws-sdk-core (~> 3, >= 3.118.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.117.0)
+    aws-sdk-core (3.119.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-firehose (1.37.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-firehose (1.38.0)
+      aws-sdk-core (~> 3, >= 3.118.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kinesis (1.32.1)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-kinesis (1.33.0)
+      aws-sdk-core (~> 3, >= 3.118.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.44.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-kms (1.46.0)
+      aws-sdk-core (~> 3, >= 3.119.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.96.1)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-s3 (1.97.0)
+      aws-sdk-core (~> 3, >= 3.118.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.40.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-sqs (1.41.0)
+      aws-sdk-core (~> 3, >= 3.118.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.4)
       aws-eventstream (~> 1, >= 1.0.2)
@@ -52,7 +52,7 @@ GEM
     concurrent-ruby (1.1.9)
     connection_pool (2.2.5)
     cool.io (1.7.1)
-    digest-crc (0.6.3)
+    digest-crc (0.6.4)
       rake (>= 12.0.0, < 14.0.0)
     docker-api (2.2.0)
       excon (>= 0.47.0)
@@ -85,7 +85,7 @@ GEM
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
-    ffi (1.15.1)
+    ffi (1.15.3)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -220,7 +220,7 @@ GEM
       myslog (~> 0.0)
     fluent-plugin-vmware-loginsight (1.0.0)
       fluentd (>= 0.14.10, < 2)
-    fluentd (1.13.2)
+    fluentd (1.13.3)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.8.0)
@@ -282,6 +282,7 @@ GEM
     net-http-persistent (3.1.0)
       connection_pool (~> 2.2)
     netrc (0.11.0)
+    oj (3.11.0)
     openid_connect (1.1.8)
       activemodel
       attr_required (>= 1.0.0)
@@ -360,7 +361,7 @@ PLATFORMS
   x86_64-darwin-20
 
 DEPENDENCIES
-  ffi (= 1.15.1)
+  ffi
   fluent-plugin-amqp (= 0.14.0)
   fluent-plugin-azure-loganalytics (= 0.7.0)
   fluent-plugin-cloudwatch-logs (= 0.14.0)
@@ -402,10 +403,11 @@ DEPENDENCIES
   fluent-plugin-verticajson (= 0.0.6)
   fluent-plugin-vmware-log-intelligence (= 2.0.6)
   fluent-plugin-vmware-loginsight (= 1.0.0)
-  fluentd (~> 1.13.2)
+  fluentd (~> 1.13.3)
   gelf (= 3.1.0)
   kubeclient (~> 4.9.0, < 5.0.0)
   logfmt (= 0.0.9)
+  oj (= 3.11.0)
 
 BUNDLED WITH
    2.2.24
diff --git a/base-image/basegems/Gemfile b/base-image/basegems/Gemfile
@@ -13,14 +13,14 @@ gem 'matrix', '0.1.0'
 gem 'mutex_m', '0.1.0'
 gem 'net-telnet', '0.2.0'
 gem 'nio4r', '2.5.2'
-gem 'oj', '3.10.18'
 gem 'ostruct', '0.1.0'
 gem 'power_assert', '1.1.3'
 gem 'prime'
 gem 'protocol-hpack', '1.4.1'
 gem 'protocol-http', '0.21.0'
 gem 'protocol-http1', '0.13.0'
 gem 'protocol-http2', '0.14.0'
+gem 'rdoc', '6.3.2'
 gem 'rexml', '3.2.5'
 gem 'rss', '0.2.7'
 gem 'sync', '0.5.0'

diff --git a/base-image/basegems/Gemfile.lock b/base-image/basegems/Gemfile.lock
@@ -30,7 +30,6 @@ GEM
     mutex_m (0.1.0)
     net-telnet (0.2.0)
     nio4r (2.5.2)
-    oj (3.10.18)
     ostruct (0.1.0)
     power_assert (1.1.3)
     prime (0.1.2)
@@ -44,6 +43,7 @@ GEM
       protocol-hpack (~> 1.4)
       protocol-http (~> 0.18)
     rake (13.0.3)
+    rdoc (6.3.2)
     resolv (0.2.1)
     rexml (3.2.5)
     rss (0.2.7)
@@ -76,7 +76,6 @@ DEPENDENCIES
   mutex_m (= 0.1.0)
   net-telnet (= 0.2.0)
   nio4r (= 2.5.2)
-  oj (= 3.10.18)
   ostruct (= 0.1.0)
   power_assert (= 1.1.3)
   prime
@@ -85,6 +84,7 @@ DEPENDENCIES
   protocol-http1 (= 0.13.0)
   protocol-http2 (= 0.14.0)
   rake (= 13.0.3)
+  rdoc (= 6.3.2)
   resolv (= 0.2.1)
   rexml (= 3.2.5)
   rss (= 0.2.7)