fluent-plugin-kubernetes-objects 1.1.10 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31c2ee4ae02b06ac69811b0df399f70ca9641a0449b6891e715363d0122a2805
-  data.tar.gz: 945e7c6459aa6de997e6b578f7205a839c8300c6ab598852bb656e493659e1a3
+  metadata.gz: 168ae6862575cb688a5ace5531696af279ddd206aebcbf766ce180db6701455d
+  data.tar.gz: 101051ee22a5f01605ce41d7ad6a061df76bcccc35c972c478a7423620f205d2
 SHA512:
-  metadata.gz: 6c6c6197b3cfa30a9c12f53de39a49a2b9e6faa17ebb58e89999349df390422e458171d3fcb32207074b3cc3b801df619e188a4a7ef1646e2ef05c26ea26bb1a
-  data.tar.gz: 369e596ee739619b78f484ce4611b77726d8acb54b386da5c4f057d699a4aac71f3d47858b57a9f86c655ee10878c80463dab520247d1b556dc1be3de32ce7fd
+  metadata.gz: cd2f8d7394710699313059decd82ad47070dca1af377a6b27b4f08f697eb236c1282e2a84e74c9ffb0671d6b5e7185d241c35327ec93ebf0419a77a9fd30b5f8
+  data.tar.gz: '09e3862f49c87309ab218364d7762ce6b88c2c6731ceb40225637021946fdb2388040bd85c7a4dad4fb0efeea975eff81588d30e2bf94ee4505a60d39fc212f9'

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes-objects (1.1.10)
+    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
@@ -22,12 +22,12 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    fluentd (1.14.4)
+    fluentd (1.14.5)
       bundler
       cool.io (>= 1.4.5, < 2.0.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.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     minitest (5.14.4)
-    msgpack (1.4.4)
+    msgpack (1.4.5)
+    multi_json (1.15.0)
     netrc (0.11.0)
     power_assert (2.0.1)
     public_suffix (4.0.6)
@@ -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.3.9
+   2.3.10

data/VERSION

@@ -1 +1 @@
-1.1.10
+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
 

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>

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.10
+  version: 1.1.11
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-15 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