fluent-plugin-kubernetes-objects 1.1.8 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a984ac533b28728173a84cc9305340939752ce3e1ead699b762a13be67bd73f
-  data.tar.gz: a1d9f0e6e239321e18f6730af71d8e316a80d863ac9df1e8e83c33ec70a775d4
+  metadata.gz: 168ae6862575cb688a5ace5531696af279ddd206aebcbf766ce180db6701455d
+  data.tar.gz: 101051ee22a5f01605ce41d7ad6a061df76bcccc35c972c478a7423620f205d2
 SHA512:
-  metadata.gz: 6c1aeb68f7f4c4310f588548ce6f76a815eacd2f8f5e18863e5ff0297a2c0a5ec4530dcc21227128d4d235bdf8f41a1139d04915b6bcd347b9ea2c0fd9166812
-  data.tar.gz: 002f53051516c3951845bdd290f959b82b5ee0a99d2a3fa1f6b766a540f57421995e6187e051b18d7dbacfc0fd1c443bb4456f7db5c2dd80c4555cb3b6f90faa
+  metadata.gz: cd2f8d7394710699313059decd82ad47070dca1af377a6b27b4f08f697eb236c1282e2a84e74c9ffb0671d6b5e7185d241c35327ec93ebf0419a77a9fd30b5f8
+  data.tar.gz: '09e3862f49c87309ab218364d7762ce6b88c2c6731ceb40225637021946fdb2388040bd85c7a4dad4fb0efeea975eff81588d30e2bf94ee4505a60d39fc212f9'

data/Gemfile.lock

@@ -1,33 +1,33 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes-objects (1.1.8)
+    fluent-plugin-kubernetes-objects (1.1.11)
       fluentd (>= 1.9.1)
       http_parser.rb (= 0.5.3)
-      kubeclient (~> 4.6.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.5)
       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)
@@ -47,15 +47,19 @@ GEM
     http-parser (1.2.3)
       ffi-compiler (>= 1.0, < 2.0)
     http_parser.rb (0.5.3)
-    kubeclient (4.6.0)
+    jsonpath (1.1.0)
+      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)
+    mime-types-data (3.2022.0105)
     minitest (5.14.4)
-    msgpack (1.4.2)
+    msgpack (1.4.5)
+    multi_json (1.15.0)
     netrc (0.11.0)
     power_assert (2.0.1)
     public_suffix (4.0.6)
@@ -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)
@@ -81,11 +85,11 @@ GEM
       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)
@@ -106,4 +110,4 @@ DEPENDENCIES
   webmock (~> 3.5)
 
 BUNDLED WITH
-   2.2.30
+   2.3.10

data/VERSION

@@ -1 +1 @@
-1.1.8
+1.1.11

data/fluent-plugin-kubernetes-objects.gemspec

@@ -22,7 +22,7 @@ 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 'kubeclient', '~> 4.9.3'
   spec.add_runtime_dependency 'http_parser.rb', '= 0.5.3'
 
   spec.add_development_dependency 'bundler', '~> 2.0'

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.8
+  version: 1.1.11
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2022-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -30,14 +30,14 @@ 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
@@ -172,12 +172,12 @@ signing_key:
 specification_version: 4
 summary: Fluentd Plugin for Kubernetes Objects.
 test_files:
-- test/test_helper.rb
 - test/fluent/plugin/in_kubernetes_objects_test.rb
-- test/lib/no_webmock/http_lib_adapters/curb_adapter.rb
+- test/test_helper.rb
 - test/lib/no_webmock/http_lib_adapters/httpclient_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/excon_adapter.rb
+- test/lib/no_webmock/http_lib_adapters/curb_adapter.rb
 - test/lib/no_webmock/http_lib_adapters/patron_adapter.rb