fluent-plugin-kubernetes-objects 1.1.9 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7602dda42aa5fe4f927a47b9ee072345c59ed9586e29292ed0c872b64b409d2f
-  data.tar.gz: 063f744a457182eb665326519ac7fcb0ca9e7b551302d3439a938bb6d499a430
+  metadata.gz: 1ed6573de6d2faa08a127f6254940f109642d86a120f77e01049208718e3ed47
+  data.tar.gz: 4c2b866680f316d56082dee6b217baee5cb52c7eb1f8ee67ceb42be2c6ff8c7c
 SHA512:
-  metadata.gz: d7003b38041972e6dfac3641cf9fdfa78b9c7446d79016dc15532675c7b69c1cc4c5254a80ce5e312311acc7ccdb7e110def1e1dd95093fde61b5c9285a0956a
-  data.tar.gz: 0bbaaaffee31289e17f8dfb5b730743032df146302edf102d101e5a7d71dcd94e43abd41967673ae8de1007e600eaf292ee682dee4e308612d7047110169a759
+  metadata.gz: 8198ca5056cdad411ce1e7163e06990f03cf7184f84a5932e57896f02bd05bf2d6509bc5220d97c946bb6003e4f992034929f1b53a56925d84dc72a24d99a266
+  data.tar.gz: e8e1b0bad7566e7d075c9ae3035a7337d6c321b5c02616ef809ca828829185c0f939d569cbd48d575aa1ede558a14703c7686edf47210f3126d92d49d1926b89

data/Gemfile.lock

@@ -1,33 +1,33 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes-objects (1.1.9)
+    fluent-plugin-kubernetes-objects (1.1.12)
       fluentd (>= 1.9.1)
-      http_parser.rb (= 0.5.3)
-      kubeclient (~> 4.6.0)
+      http_parser.rb (= 0.8.0)
+      kubeclient (~> 4.9.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     cool.io (1.7.1)
     crack (0.4.5)
       rexml
     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.6)
       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)
+      serverengine (>= 2.2.5, < 3.0.0)
       sigdump (~> 0.2.2)
       strptime (>= 0.2.4, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
@@ -46,19 +46,23 @@ GEM
     http-form_data (2.3.0)
     http-parser (1.2.3)
       ffi-compiler (>= 1.0, < 2.0)
-    http_parser.rb (0.5.3)
-    kubeclient (4.6.0)
+    http_parser.rb (0.8.0)
+    jsonpath (1.1.2)
+      multi_json
+    kubeclient (4.9.3)
       http (>= 3.0, < 5.0)
-      recursive-open-struct (~> 1.0, >= 1.0.4)
+      jsonpath (~> 1.0)
+      recursive-open-struct (~> 1.1, >= 1.1.1)
       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)
-    minitest (5.14.4)
-    msgpack (1.4.2)
+    mime-types-data (3.2022.0105)
+    minitest (5.15.0)
+    msgpack (1.5.1)
+    multi_json (1.15.0)
     netrc (0.11.0)
     power_assert (2.0.1)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rake (13.0.6)
     recursive-open-struct (1.1.3)
     rest-client (2.1.0)
@@ -67,7 +71,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)
@@ -75,23 +79,23 @@ GEM
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
+    simplecov_json_formatter (0.1.4)
     strptime (0.2.5)
-    test-unit (3.5.0)
+    test-unit (3.5.3)
       power_assert
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.5)
+    tzinfo-data (1.2022.1)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.1)
     webmock (3.14.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.7.0)
-    yajl-ruby (1.4.1)
+    yajl-ruby (1.4.2)
 
 PLATFORMS
   ruby
@@ -106,4 +110,4 @@ DEPENDENCIES
   webmock (~> 3.5)
 
 BUNDLED WITH
-   2.2.33
+   2.3.12

data/VERSION

@@ -1 +1 @@
-1.1.9
+1.1.12

data/fluent-plugin-kubernetes-objects.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.required_ruby_version = '>= 2.3.0'
   spec.add_runtime_dependency 'fluentd', '>= 1.9.1'
-  spec.add_runtime_dependency 'kubeclient', '~> 4.6.0'
-  spec.add_runtime_dependency 'http_parser.rb', '= 0.5.3'
+  spec.add_runtime_dependency 'kubeclient', '~> 4.9.3'
+  spec.add_runtime_dependency 'http_parser.rb', '= 0.8.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'minitest', '~> 5.11'

data/lib/fluent/plugin/in_kubernetes_objects.rb

@@ -20,6 +20,9 @@ module Fluent::Plugin
     desc 'Kubernetes API version.'
     config_param :api_version, :string, default: 'v1'
 
+    desc 'Kubernetes API endpoint.'
+    config_param :api_endpoint, :string, default: 'api'
+
     desc 'Path to the certificate file for this client.'
     config_param :client_cert, :string, default: nil
 
@@ -139,7 +142,7 @@ module Fluent::Plugin
         env_host = ENV['KUBERNETES_SERVICE_HOST']
         env_port = ENV['KUBERNETES_SERVICE_PORT']
         if env_host && env_port
-          @kubernetes_url = "https://#{env_host}:#{env_port}/#{@api_version == 'v1' ? 'api' : 'apis'}"
+          @kubernetes_url = "https://#{env_host}:#{env_port}/#{@api_endpoint.delete_prefix('/')}"
         end
       end
 
@@ -200,7 +203,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 +251,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

@@ -57,8 +57,9 @@ describe Fluent::Plugin::KubernetesObjectsInput do
       puts 'Test: should use pick the right path'
       ENV['KUBERNETES_SERVICE_HOST'] = k8s_host
       ENV['KUBERNETES_SERVICE_PORT'] = k8s_port
-      expect(create_input_driver(<<~CONF).instance.kubernetes_url).must_equal k8s_url('apis')
-      api_version apps/v1
+      expect(create_input_driver(<<~CONF).instance.kubernetes_url).must_equal k8s_url('apis/apps')
+      api_endpoint apis/apps
+      api_version v1
       <pull>
       resource_name deployments
       </pull>
@@ -144,5 +145,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

data/test/test_helper.rb

@@ -54,6 +54,9 @@ module PluginTestHelper
     stub_k8s_nodes
     stub_k8s_pods
     stub_k8s_events
+    stub_k8s_apps
+    stub_k8s_apps_v1
+    stub_k8s_apps_v1_namespace
   end
 
   def stub_k8s_api
@@ -68,6 +71,24 @@ module PluginTestHelper
     end.close
   end
 
+  def stub_k8s_apps
+    File.open(File.expand_path('apps.json', __dir__)).tap do |f|
+      stub_request(:get, k8s_url('apis/apps')).to_return(body: f.read)
+    end.close
+  end
+
+  def stub_k8s_apps_v1
+    File.open(File.expand_path('apps-v1.json', __dir__)).tap do |f|
+      stub_request(:get, k8s_url('apis/apps/v1')).to_return(body: f.read)
+    end.close
+  end
+
+  def stub_k8s_apps_v1_namespace
+    File.open(File.expand_path('apps-v1-namespace.json', __dir__)).tap do |f|
+      stub_request(:get, k8s_url('apis/apps')).to_return(body: f.read)
+    end.close
+  end
+
   def stub_k8s_v1
     File.open(File.expand_path('v1.json', __dir__)).tap do |f|
       stub_request(:get, "#{k8s_url}/v1").to_return(body: f.read)

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.12
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.0
+        version: 4.9.3
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -172,12 +172,12 @@ signing_key:
 specification_version: 4
 summary: Fluentd Plugin for Kubernetes Objects.
 test_files:
-- 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/httpclient_adapter.rb
+- test/lib/no_webmock/http_lib_adapters/patron_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/curb_adapter.rb
-- test/lib/no_webmock/http_lib_adapters/patron_adapter.rb
+- test/test_helper.rb
 - test/fluent/plugin/in_kubernetes_objects_test.rb