fluent-plugin-kubernetes-objects 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7602dda42aa5fe4f927a47b9ee072345c59ed9586e29292ed0c872b64b409d2f
-  data.tar.gz: 063f744a457182eb665326519ac7fcb0ca9e7b551302d3439a938bb6d499a430
+  metadata.gz: 31c2ee4ae02b06ac69811b0df399f70ca9641a0449b6891e715363d0122a2805
+  data.tar.gz: 945e7c6459aa6de997e6b578f7205a839c8300c6ab598852bb656e493659e1a3
 SHA512:
-  metadata.gz: d7003b38041972e6dfac3641cf9fdfa78b9c7446d79016dc15532675c7b69c1cc4c5254a80ce5e312311acc7ccdb7e110def1e1dd95093fde61b5c9285a0956a
-  data.tar.gz: 0bbaaaffee31289e17f8dfb5b730743032df146302edf102d101e5a7d71dcd94e43abd41967673ae8de1007e600eaf292ee682dee4e308612d7047110169a759
+  metadata.gz: 6c6c6197b3cfa30a9c12f53de39a49a2b9e6faa17ebb58e89999349df390422e458171d3fcb32207074b3cc3b801df619e188a4a7ef1646e2ef05c26ea26bb1a
+  data.tar.gz: 369e596ee739619b78f484ce4611b77726d8acb54b386da5c4f057d699a4aac71f3d47858b57a9f86c655ee10878c80463dab520247d1b556dc1be3de32ce7fd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes-objects (1.1.9)
+    fluent-plugin-kubernetes-objects (1.1.10)
       fluentd (>= 1.9.1)
       http_parser.rb (= 0.5.3)
       kubeclient (~> 4.6.0)
@@ -18,14 +18,14 @@ GEM
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ffi (1.15.4)
+    ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    fluentd (1.14.2)
+    fluentd (1.14.4)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
-      http_parser.rb (>= 0.5.1, < 0.8.0)
+      http_parser.rb (>= 0.5.1, < 0.9.0)
       msgpack (>= 1.3.1, < 2.0.0)
       serverengine (>= 2.2.2, < 3.0.0)
       sigdump (~> 0.2.2)
@@ -51,11 +51,11 @@ GEM
       http (>= 3.0, < 5.0)
       recursive-open-struct (~> 1.0, >= 1.0.4)
       rest-client (~> 2.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
+    mime-types-data (3.2022.0105)
     minitest (5.14.4)
-    msgpack (1.4.2)
+    msgpack (1.4.4)
     netrc (0.11.0)
     power_assert (2.0.1)
     public_suffix (4.0.6)
@@ -67,7 +67,7 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     rexml (3.2.5)
-    serverengine (2.2.4)
+    serverengine (2.2.5)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     simplecov (0.21.2)
@@ -106,4 +106,4 @@ DEPENDENCIES
   webmock (~> 3.5)
 
 BUNDLED WITH
-   2.2.33
+   2.3.9

data/VERSION

@@ -1 +1 @@
-1.1.9
+1.1.10

data/lib/fluent/plugin/in_kubernetes_objects.rb

@@ -200,7 +200,12 @@ module Fluent::Plugin
         tag = generate_tag resource_name
         while thread_current_running?
           log.debug "Going to pull #{resource_name}"
-          response = @client.public_send "get_#{resource_name}", options
+          begin
+            response = @client.public_send "get_#{resource_name}", options
+          rescue Kubeclient::ResourceNotFoundError, NoMethodError
+            log.error "resource '#{resource_name}' not found. Stopped pulling it"
+            break
+          end
           now = Fluent::Engine.now
           es = Fluent::MultiEventStream.new
 
@@ -243,22 +248,27 @@ module Fluent::Plugin
 
       thread_create :"watch_#{resource_name}" do
         while thread_current_running?
-          @client.public_send("watch_#{resource_name}", options).tap do |watcher|
-            tag = generate_tag "#{resource_name}"
-            begin
-              watcher.each do |entity|
-                begin
-                  entity = JSON.parse(entity)
-                  router.emit tag, Fluent::Engine.now, entity
-                  options[:resource_version] = entity['object']['metadata']['resourceVersion']
-                  @storage.put resource_name, entity['object']['metadata']['resourceVersion']
-                rescue => e
-                  log.info "Got exception #{e} parsing entity #{entity}. Resetting watcher."
+          begin
+            @client.public_send("watch_#{resource_name}", options).tap do |watcher|
+              tag = generate_tag "#{resource_name}"
+              begin
+                watcher.each do |entity|
+                  begin
+                    entity = JSON.parse(entity)
+                    router.emit tag, Fluent::Engine.now, entity
+                    options[:resource_version] = entity['object']['metadata']['resourceVersion']
+                    @storage.put resource_name, entity['object']['metadata']['resourceVersion']
+                  rescue => e
+                    log.info "Got exception #{e} parsing entity #{entity}. Resetting watcher."
+                  end
                 end
+              rescue => e
+                log.info "Got exception #{e}. Resetting watcher."
               end
-            rescue => e
-              log.info "Got exception #{e}. Resetting watcher."
             end
+          rescue Kubeclient::ResourceNotFoundError, NoMethodError
+            log.error "resource '#{resource_name}' not found. Stopped watching it"
+            break
           end
         end
       end

data/test/fluent/plugin/in_kubernetes_objects_test.rb

@@ -144,5 +144,28 @@ describe Fluent::Plugin::KubernetesObjectsInput do
         f.unlink
       end
     end
+    it "checks for invalid pull request" do
+      d = create_input_driver(<<~CONF)
+      kubernetes_url #{k8s_url}
+      <pull>
+      resource_name fakeResource
+      </pull>
+      CONF
+
+      d.run expect_emits: 0, timeout: 3
+      
+      expect(d.logs.any? { |log| log.include? "resource 'fakeResource' not found." }).must_equal(true)
+    end
+    it "checks for invalid watch request" do
+      d = create_input_driver(<<~CONF)
+      kubernetes_url #{k8s_url}
+      <watch>
+      resource_name fakeResource
+      </watch>
+      CONF
+
+      d.run expect_emits: 0, timeout: 3
+      expect(d.logs.any? { |log| log.include? "resource 'fakeResource' not found." }).must_equal(true)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes-objects
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -172,12 +172,12 @@ signing_key:
 specification_version: 4
 summary: Fluentd Plugin for Kubernetes Objects.
 test_files:
+- test/fluent/plugin/in_kubernetes_objects_test.rb
 - test/test_helper.rb
 - test/lib/no_webmock/http_lib_adapters/httpclient_adapter.rb
-- test/lib/no_webmock/http_lib_adapters/manticore_adapter.rb
-- test/lib/no_webmock/http_lib_adapters/typhoeus_hydra_adapter.rb
-- test/lib/no_webmock/http_lib_adapters/em_http_request_adapter.rb
 - test/lib/no_webmock/http_lib_adapters/excon_adapter.rb
+- test/lib/no_webmock/http_lib_adapters/em_http_request_adapter.rb
+- test/lib/no_webmock/http_lib_adapters/typhoeus_hydra_adapter.rb
+- test/lib/no_webmock/http_lib_adapters/manticore_adapter.rb
 - test/lib/no_webmock/http_lib_adapters/curb_adapter.rb
 - test/lib/no_webmock/http_lib_adapters/patron_adapter.rb
-- test/fluent/plugin/in_kubernetes_objects_test.rb