fluent-plugin-kubernetes_metadata_filter 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a221d8fa203e3a37486010781387ef2407e1cf68133530d029344981be45b51d
-  data.tar.gz: 4e38e559dd5e9a98d8819778d7a293dfbc537bfaccab5fdae2fd19572b794ad2
+  metadata.gz: 575489bd872c75d8035fe86c3142e8286cbdcbda3bc282632f6965066bb0e683
+  data.tar.gz: f6d697e6294b206e85b6b4cfc3bc1f8d3393aa71f13ea4f6d6817b50da039174
 SHA512:
-  metadata.gz: d205ea159f0a54edcc58a9e0794079c2aa5772269ed589156d587adf78b22380669d164013675227750cabca826cab29144ef2cfaa5bf0704eb72efb365d89e3
-  data.tar.gz: d43b8aa7415ebda5df028e4a63113db79a928a202b110791b70c65dfae877d5a77465957326fb370c4e5bba1951a1338c0382572b1269b36d580ad0f377ed6f4
+  metadata.gz: a441fb799b3047fc6796a290572af3fdce3cba0bf37f41c2ebfc325b69ec0ba990c11b9c487acd2bf1b2349047be549da99a6b73ebbabc42059b88266fd8ed4c
+  data.tar.gz: fe9397d1a5e3c270650cf297a0fd1b566552df418ef6ae78b7e4633f09d466733c2d0ad98663d8fdb378e3b8192a493f2de6863fba5df2ae47c33855e7495a12

data/fluent-plugin-kubernetes_metadata_filter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-kubernetes_metadata_filter"
-  gem.version       = "2.3.0"
+  gem.version       = "2.4.0"
   gem.authors       = ["Jimmi Dyson"]
   gem.email         = ["jimmidyson@gmail.com"]
   gem.description   = %q{Filter plugin to add Kubernetes metadata}
@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "lru_redux"
   gem.add_runtime_dependency "kubeclient", '< 5'
 
-  gem.add_development_dependency "bundler", "~> 1.3"
+  gem.add_development_dependency "bundler", "~> 2.0.2"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "minitest", "~> 4.0"
   gem.add_development_dependency "test-unit", "~> 3.0.2"

data/lib/fluent/plugin/kubernetes_metadata_watch_pods.rb

@@ -25,8 +25,20 @@ module KubernetesMetadata
 
     def start_pod_watch
       begin
-        resource_version = @client.get_pods.resourceVersion
-        watcher          = @client.watch_pods(resource_version)
+        options = {
+          resource_version: '0'  # Fetch from API server.
+        }
+        if ENV['K8S_NODE_NAME']
+          options[:field_selector] = 'spec.nodeName=' + ENV['K8S_NODE_NAME']
+        end
+        pods = @client.get_pods(options)
+        pods.each do |pod|
+          cache_key = pod.metadata['uid']
+          @cache[cache_key] = parse_pod_metadata(pod)
+          @stats.bump(:pod_cache_host_updates)
+        end
+        options[:resource_version] = pods.resourceVersion
+        watcher = @client.watch_pods(options)
       rescue Exception => e
         message = "Exception encountered fetching metadata from Kubernetes API endpoint: #{e.message}"
         message += " (#{e.response})" if e.respond_to?(:response)

data/test/plugin/test_watch_pods.rb

@@ -25,6 +25,47 @@ class DefaultPodWatchStrategyTest < WatchTest
      include KubernetesMetadata::WatchPods
 
      setup do
+       @initial = Kubeclient::Common::EntityList.new(
+         'PodList',
+         '123',
+         [
+           Kubeclient::Resource.new({
+                                      'metadata' => {
+                                        'name' => 'initial',
+                                        'namespace' => 'initial_ns',
+                                        'uid' => 'initial_uid',
+                                        'labels' => {},
+                                      },
+                                      'spec' => {
+                                        'nodeName' => 'aNodeName',
+                                        'containers' => [{
+                                                           'name' => 'foo',
+                                                           'image' => 'bar',
+                                                         }, {
+                                                           'name' => 'bar',
+                                                           'image' => 'foo',
+                                                         }]
+                                      }
+                                    }),
+           Kubeclient::Resource.new({
+                                      'metadata' => {
+                                        'name' => 'modified',
+                                        'namespace' => 'create',
+                                        'uid' => 'modified_uid',
+                                        'labels' => {},
+                                      },
+                                      'spec' => {
+                                        'nodeName' => 'aNodeName',
+                                        'containers' => [{
+                                                           'name' => 'foo',
+                                                           'image' => 'bar',
+                                                         }, {
+                                                           'name' => 'bar',
+                                                           'image' => 'foo',
+                                                         }]
+                                      }
+                                    }),
+         ])
        @created = OpenStruct.new(
          type: 'CREATED',
          object: {
@@ -97,11 +138,38 @@ class DefaultPodWatchStrategyTest < WatchTest
        )
      end
 
+    test 'pod list caches pods' do
+      orig_env_val = ENV['K8S_NODE_NAME']
+      ENV['K8S_NODE_NAME'] = 'aNodeName'
+      @client.stub :get_pods, @initial do
+        start_pod_watch
+        assert_equal(true, @cache.key?('initial_uid'))
+        assert_equal(true, @cache.key?('modified_uid'))
+        assert_equal(2, @stats[:pod_cache_host_updates])
+      end
+      ENV['K8S_NODE_NAME'] = orig_env_val
+    end
+
+    test 'pod list caches pods and watch updates' do
+      orig_env_val = ENV['K8S_NODE_NAME']
+      ENV['K8S_NODE_NAME'] = 'aNodeName'
+      @client.stub :get_pods, @initial do
+        @client.stub :watch_pods, [@modified] do
+          start_pod_watch
+          assert_equal(2, @stats[:pod_cache_host_updates])
+          assert_equal(1, @stats[:pod_cache_watch_updates])
+        end
+      end
+      ENV['K8S_NODE_NAME'] = orig_env_val
+    end
+
     test 'pod watch notice ignores CREATED' do
-      @client.stub :watch_pods, [@created] do
-       start_pod_watch
-       assert_equal(false, @cache.key?('created_uid'))
-       assert_equal(1, @stats[:pod_cache_watch_ignored])
+      @client.stub :get_pods, @initial do
+        @client.stub :watch_pods, [@created] do
+          start_pod_watch
+          assert_equal(false, @cache.key?('created_uid'))
+          assert_equal(1, @stats[:pod_cache_watch_ignored])
+        end
       end
     end
 

data/test/plugin/watch_test.rb

@@ -30,16 +30,16 @@ class WatchTest < Test::Unit::TestCase
       def @client.resourceVersion
         '12345'
       end
-      def @client.watch_pods(value)
+      def @client.watch_pods(options = {})
          []
       end
-      def @client.watch_namespaces(value)
+      def @client.watch_namespaces(options = {})
          []
       end
-      def @client.get_namespaces 
+      def @client.get_namespaces(options = {})
           self
       end
-      def @client.get_pods
+      def @client.get_pods(options = {})
           self
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2019-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Fluentd filter plugin to add Kubernetes metadata