fluent-plugin-kubernetes_metadata_filter 2.4.7 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b79c9bdf0078c411c16855d5447963bf0cf112545dbdd9ce482636ef5628b731
-  data.tar.gz: 2b1289c54f2ea7926d077d2ce1176b0470ed869e024577172e01b42a8f17c3e5
+  metadata.gz: b1991a6b8cd09f65728588401e697dda36954b94cf75b625789c6e7773d50ccf
+  data.tar.gz: df46f28a113c17aa3e2174d3ad23edb0b5b93fb6d65d5f02787d6ac83ac129a2
 SHA512:
-  metadata.gz: e354cffb2942f9da443d7219d0cbf4b93463207ec188471b6c6e8a06b180655a2befd2500b9a55c62fb96a524025a6a77fb1fdd6a031295cad6394e767104439
-  data.tar.gz: 344d0cdd184e0bdab9c072367ead78b23a16ee69fd4c938ba460aa6213179a091c14fdc6dd3829d74a470307f6bd5dc680f9fc7226f066daaa1ac21bdfab9b09
+  metadata.gz: 1a41d498af8a2e92723c05679608294d07acf2cf7a87dfdf5921fe3a385df6369003eef939dd5aeabf970c67f31eb319ac1485d566ac110bcbe6b79f5acc392a
+  data.tar.gz: e62c355dbdb0ac1e89e43534c5929c80e82b166f5c614b1967d6ff79658835881a9c6803d5072e85a41c83fbefc8db326ba95c6d2f1c5a20ca1b8a0f18ce3cf1

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes_metadata_filter (2.4.7)
-      fluentd (>= 0.14.0, < 1.10)
+    fluent-plugin-kubernetes_metadata_filter (2.5.0)
+      fluentd (>= 0.14.0, < 1.12)
       kubeclient (< 5)
       lru_redux
 
@@ -11,7 +11,7 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.0)
+    ast (2.4.1)
     bump (0.9.0)
     charlock_holmes (0.7.7)
     codeclimate-test-reporter (0.6.0)
@@ -30,7 +30,7 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    fluentd (1.9.3)
+    fluentd (1.11.1)
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       msgpack (>= 1.3.1, < 2.0.0)
@@ -40,7 +40,7 @@ GEM
       tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
       yajl-ruby (~> 1.0)
-    github-linguist (7.8.0)
+    github-linguist (7.9.0)
       charlock_holmes (~> 0.7.6)
       escape_utils (~> 1.2.0)
       mini_mime (~> 1.0)
@@ -58,13 +58,8 @@ GEM
     http-parser (1.2.1)
       ffi-compiler (>= 1.0, < 2.0)
     http_parser.rb (0.6.0)
-    jaro_winkler (1.5.4)
-    jsonpath (1.0.5)
-      multi_json
-      to_regexp (~> 0.2.1)
-    kubeclient (4.8.0)
+    kubeclient (4.7.0)
       http (>= 3.0, < 5.0)
-      jsonpath (~> 1.0)
       recursive-open-struct (~> 1.1, >= 1.1.1)
       rest-client (~> 2.0)
     lru_redux (1.1.0)
@@ -74,16 +69,16 @@ GEM
     mini_mime (1.0.2)
     minitest (4.7.5)
     msgpack (1.3.3)
-    multi_json (1.15.0)
     netrc (0.11.0)
-    parallel (1.19.1)
-    parser (2.7.0.4)
-      ast (~> 2.4.0)
-    power_assert (1.1.6)
-    public_suffix (4.0.3)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    power_assert (1.2.0)
+    public_suffix (4.0.5)
     rainbow (3.0.0)
     rake (13.0.1)
     recursive-open-struct (1.1.2)
+    regexp_parser (1.7.1)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -91,16 +86,19 @@ GEM
       netrc (~> 0.8)
     rexml (3.2.4)
     rr (1.2.1)
-    rubocop (0.80.1)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.86.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
+      rubocop-ast (>= 0.0.3, < 1.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.1.0)
+      parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
-    rugged (0.99.0)
+    rugged (1.0.1)
     safe_yaml (1.0.5)
     serverengine (2.2.1)
       sigdump (~> 0.2.2)
@@ -115,7 +113,6 @@ GEM
     test-unit-rr (1.0.5)
       rr (>= 1.1.1)
       test-unit (>= 2.5.2)
-    to_regexp (0.2.1)
     tzinfo (2.0.2)
       concurrent-ruby (~> 1.0)
     tzinfo-data (1.2020.1)
@@ -123,8 +120,8 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    unicode-display_width (1.6.1)
-    vcr (5.1.0)
+    unicode-display_width (1.7.0)
+    vcr (6.0.0)
     webmock (3.8.3)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)

data/README.md

@@ -15,6 +15,7 @@ that rely on the authenticity of the namespace for proper log isolation.
 
 | fluent-plugin-kubernetes_metadata_filter  | fluentd | ruby |
 |-------------------|---------|------|
+| >= 2.5.0 | >= v1.10.0 | >= 2.5 |
 | >= 2.0.0 | >= v0.14.20 | >= 2.1 |
 |  < 2.0.0 | >= v0.12.0 | >= 1.9 |
 

data/fluent-plugin-kubernetes_metadata_filter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-kubernetes_metadata_filter"
-  gem.version       = "2.4.7"
+  gem.version       = "2.5.0"
   gem.authors       = ["Jimmi Dyson"]
   gem.email         = ["jimmidyson@gmail.com"]
   gem.description   = %q{Filter plugin to add Kubernetes metadata}
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.1.0'
 
-  gem.add_runtime_dependency 'fluentd', ['>= 0.14.0', '< 1.10']
+  gem.add_runtime_dependency 'fluentd', ['>= 0.14.0', '< 1.12']
   gem.add_runtime_dependency "lru_redux"
   gem.add_runtime_dependency "kubeclient", '< 5'
 

data/lib/fluent/plugin/kubernetes_metadata_watch_pods.rb

@@ -19,13 +19,6 @@
 require_relative 'kubernetes_metadata_common'
 
 module KubernetesMetadata
-
-  class GoneError < StandardError
-    def initialize(msg="410 Gone")
-      super
-    end
-  end
-
   module WatchPods
 
     include ::KubernetesMetadata::Common
@@ -46,11 +39,6 @@ module KubernetesMetadata
         begin
           pod_watcher ||= get_pods_and_start_watcher
           process_pod_watcher_notices(pod_watcher)
-        rescue GoneError
-          # Expected error. Quietly go back through the loop in order to
-          # start watching from the latest resource versions
-          log.debug("410 Gone encountered. Restarting watch to reset resource versions.")
-          pod_watcher = nil
         rescue Exception => e
           @stats.bump(:pod_watch_failures)
           if Thread.current[:pod_watch_retry_count] < @watch_retry_max_times
@@ -141,14 +129,9 @@ module KubernetesMetadata
             # deleted but still processing logs
             @stats.bump(:pod_cache_watch_delete_ignored)
           when 'ERROR'
-            if notice.object && notice.object['code'] == 410
-              @stats.bump(:pod_watch_gone_notices)
-              raise GoneError
-            else
-              @stats.bump(:pod_watch_error_type_notices)
-              message = notice['object']['message'] if notice['object'] && notice['object']['message']
-              raise "Error while watching pods: #{message}"
-            end
+            @stats.bump(:pod_watch_error_type_notices)
+            message = notice['object']['message'] if notice['object'] && notice['object']['message']
+            raise "Error while watching pods: #{message}"
           else
             reset_pod_watch_retry_stats
             # Don't pay attention to creations, since the created pod may not

data/test/plugin/test_watch_pods.rb

@@ -142,20 +142,6 @@ class DefaultPodWatchStrategyTest < WatchTest
            'message' => 'some error message'
          }
        )
-       @gone = OpenStruct.new(
-           type: 'ERROR',
-           object: {
-               'code' => 410,
-               'kind' => 'Status',
-               'message' => 'too old resource version: 123 (391079)',
-               'metadata' => {
-                   'name' => 'gone',
-                   'namespace' => 'gone',
-                   'uid' => 'gone_uid'
-               },
-               'reason' => 'Gone'
-           }
-       )
      end
 
     test 'pod list caches pods' do
@@ -244,16 +230,6 @@ class DefaultPodWatchStrategyTest < WatchTest
       end
     end
 
-     test 'pod watch raises a GoneError when a 410 Gone error is received' do
-       @cache['gone_uid'] = {}
-       @client.stub :watch_pods, [@gone] do
-         assert_raise KubernetesMetadata::GoneError do
-           process_pod_watcher_notices(start_pod_watch)
-         end
-         assert_equal(1, @stats[:pod_watch_gone_notices])
-       end
-     end
-
     test 'pod watch retries when error is received' do
       @client.stub :get_pods, @initial do
         @client.stub :watch_pods, [@error] do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.5.0
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-10 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -19,7 +19,7 @@ dependencies:
         version: 0.14.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 0.14.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: lru_redux
   requirement: !ruby/object:Gem::Requirement
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Fluentd filter plugin to add Kubernetes metadata