fluent-plugin-kubernetes-objects 1.1.10 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31c2ee4ae02b06ac69811b0df399f70ca9641a0449b6891e715363d0122a2805
-  data.tar.gz: 945e7c6459aa6de997e6b578f7205a839c8300c6ab598852bb656e493659e1a3
+  metadata.gz: 0b2a488a7c570f3b00445f3e0b9b3e9889225f43dac72427af5c7ef6a1e66407
+  data.tar.gz: e0a7f1cfb2a129fbf225fd0fed8a41cd05504f0858664699dbea466d73c0f254
 SHA512:
-  metadata.gz: 6c6c6197b3cfa30a9c12f53de39a49a2b9e6faa17ebb58e89999349df390422e458171d3fcb32207074b3cc3b801df619e188a4a7ef1646e2ef05c26ea26bb1a
-  data.tar.gz: 369e596ee739619b78f484ce4611b77726d8acb54b386da5c4f057d699a4aac71f3d47858b57a9f86c655ee10878c80463dab520247d1b556dc1be3de32ce7fd
+  metadata.gz: 8c8ce749b0f430d7d01ea3cb45ff115660e344b40978fc8587ba1b5677eed1be09cf88695b3da25fc6380ce40cc3f4611db4351f2dd86312eb9f6643d3b9c156
+  data.tar.gz: fc0657a808b8481ecb1d5f41b3f8c747e27631db0751e561931a467c893f66060946f603d4e9199dd0540d237d9883ca71706abdc77dd1d2efb3969237a8692d

data/Gemfile

@@ -8,3 +8,4 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in fluent-plugin-kubernetes_objects_input.gemspec
 gemspec
+gem 'kubeclient', git: 'https://github.com/splunk/kubeclient.git', ref: '955ec5b'

data/Gemfile.lock

@@ -1,17 +1,28 @@
+GIT
+  remote: https://github.com/splunk/kubeclient.git
+  revision: 955ec5b62f64b6065b25a7c0c76467e8b6badf17
+  ref: 955ec5b
+  specs:
+    kubeclient (4.9.3)
+      http (>= 3.0, < 5.0)
+      jsonpath (~> 1.0)
+      recursive-open-struct (~> 1.1, >= 1.1.1)
+      rest-client (~> 2.0)
+
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes-objects (1.1.10)
+    fluent-plugin-kubernetes-objects (1.2.0)
       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
@@ -22,12 +33,12 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    fluentd (1.14.4)
+    fluentd (1.15.1)
       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.3.0, < 3.0.0)
       sigdump (~> 0.2.2)
       strptime (>= 0.2.4, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
@@ -46,19 +57,18 @@ 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 (>= 3.0, < 5.0)
-      recursive-open-struct (~> 1.0, >= 1.0.4)
-      rest-client (~> 2.0)
+    http_parser.rb (0.8.0)
+    jsonpath (1.1.2)
+      multi_json
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    minitest (5.14.4)
-    msgpack (1.4.4)
+    minitest (5.15.0)
+    msgpack (1.5.4)
+    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 +77,7 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     rexml (3.2.5)
-    serverengine (2.2.5)
+    serverengine (2.3.0)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     simplecov (0.21.2)
@@ -75,23 +85,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)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.5)
+    tzinfo-data (1.2022.2)
       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.3)
 
 PLATFORMS
   ruby
@@ -99,6 +109,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   fluent-plugin-kubernetes-objects!
+  kubeclient!
   minitest (~> 5.11)
   rake (>= 12.0)
   simplecov
@@ -106,4 +117,4 @@ DEPENDENCIES
   webmock (~> 3.5)
 
 BUNDLED WITH
-   2.3.9
+   2.3.20

data/VERSION

@@ -1 +1 @@
-1.1.10
+1.2.0

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
 

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.2.0
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-08-16 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/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/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/httpclient_adapter.rb
 - test/lib/no_webmock/http_lib_adapters/curb_adapter.rb
+- test/lib/no_webmock/http_lib_adapters/em_http_request_adapter.rb
 - test/lib/no_webmock/http_lib_adapters/patron_adapter.rb
+- test/fluent/plugin/in_kubernetes_objects_test.rb