fluent-plugin-kubernetes_metadata_filter 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15bcd153a6de3bae669ee6b158de71aa51e40b83
-  data.tar.gz: 9e9e0267bcef78c7624c8f04590c0693c049542a
+  metadata.gz: 247710a5a22705fe46717e612a13998857661dc9
+  data.tar.gz: 419da7d1297da104e6802110ad95df22608e5c41
 SHA512:
-  metadata.gz: 93c074fe1d32346655d7599fae2bbba20af3c284e16c1df7d5a5daecced036cc2d2fb39babfb5a5889a81fa0c8866b101cbce5dc5943eb8f43242004ab3e5096
-  data.tar.gz: 4223b0c8aa1e9822d3ac185dc3a0562d4a918dc7638d5c9ee7ed79f18a9b1f1f6865b6f1e8ac6848c76ab5c1127fb45f667212b8da6f609f66a31345de8dc244
+  metadata.gz: e4417767dddc3bfabb183a32d4f79cd3622541c531fb65205dacd0678280351476bcd2165c927ba524b41f7f1dd33ddfcbb4aafc33da302cb4a13247ae16d772
+  data.tar.gz: 5e1dd6ba75d5ba6965b31bbbd98df670280bf07164680067439b662135d97fcecd96decd6a129b1dbd1a2114e5078ea7384a26f97c1a5792f6e8d7ff7578fc11

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       = "0.14.0"
+  gem.version       = "0.15.0"
   gem.authors       = ["Jimmi Dyson"]
   gem.email         = ["jimmidyson@gmail.com"]
   gem.description   = %q{Filter plugin to add Kubernetes metadata}
@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.0.0'
 
-  gem.add_runtime_dependency "fluentd"
+  gem.add_runtime_dependency "fluentd", "~> 0.12.0"
   gem.add_runtime_dependency "lru_redux"
   gem.add_runtime_dependency "kubeclient", "~> 0.4.0"
   gem.add_runtime_dependency "fluent-plugin-docker_metadata_filter"

data/lib/fluent/plugin/filter_kubernetes_metadata.rb

@@ -18,6 +18,9 @@
 #
 module Fluent
   class KubernetesMetadataFilter < Fluent::Filter
+    K8_POD_CA_CERT = 'ca.crt'
+    K8_POD_TOKEN = 'token'
+
     Fluent::Plugin.register_filter('kubernetes_metadata', self)
 
     config_param :kubernetes_url, :string, default: ''
@@ -35,6 +38,7 @@ module Fluent
     config_param :bearer_token_file, :string, default: ''
     config_param :merge_json_log, :bool, default: true
     config_param :include_namespace_id, :bool, default: false
+    config_param :secret_dir, :string, default: '/var/run/secrets/kubernetes.io/serviceaccount'
 
     def get_metadata(namespace_name, pod_name, container_name)
       begin
@@ -73,6 +77,29 @@ module Fluent
       end
       @tag_to_kubernetes_name_regexp_compiled = Regexp.compile(@tag_to_kubernetes_name_regexp)
 
+      # Use Kubernetes default service account if we're in a pod.
+      if !@kubernetes_url.present?
+        env_host = ENV['KUBERNETES_SERVICE_HOST']
+        env_port = ENV['KUBERNETES_SERVICE_PORT']
+        if !env_host.nil? and !env_port.nil?
+          @kubernetes_url = "https://#{env_host}:#{env_port}/api"
+        end
+      end
+
+      # Use SSL certificate and bearer token from Kubernetes service account.
+      if Dir.exist?(@secret_dir)
+        ca_cert = File.join(@secret_dir, K8_POD_CA_CERT)
+        pod_token = File.join(@secret_dir, K8_POD_TOKEN)
+
+        if !@ca_file.present? and File.exist?(ca_cert)
+          @ca_file = ca_cert
+        end
+
+        if !@bearer_token_file.present? and File.exist?(pod_token)
+          @bearer_token_file = pod_token
+        end
+      end
+
       if @kubernetes_url.present?
 
         ssl_options = {

data/test/plugin/test_filter_kubernetes_metadata.rb

@@ -75,6 +75,53 @@ class KubernetesMetadataFilterTest < Test::Unit::TestCase
         end
       end
     end
+
+    test 'service account credentials' do
+      VCR.use_cassette('valid_kubernetes_api_server') do
+        begin
+          ENV['KUBERNETES_SERVICE_HOST'] = 'localhost'
+          ENV['KUBERNETES_SERVICE_PORT'] = '8443'
+
+          Dir.mktmpdir { |dir|
+            # Fake token file and CA crt.
+            expected_cert_path = File.join(dir, KubernetesMetadataFilter::K8_POD_CA_CERT)
+            expected_token_path = File.join(dir, KubernetesMetadataFilter::K8_POD_TOKEN)
+
+            File.open(expected_cert_path, "w") {}
+            File.open(expected_token_path, "w") {}
+
+            d = create_driver("
+              watch false
+              secret_dir #{dir}
+            ")
+
+            assert_equal(d.instance.kubernetes_url, "https://localhost:8443/api")
+            assert_equal(d.instance.ca_file, expected_cert_path)
+            assert_equal(d.instance.bearer_token_file, expected_token_path)
+          }
+        ensure
+          ENV['KUBERNETES_SERVICE_HOST'] = nil
+          ENV['KUBERNETES_SERVICE_PORT'] = nil
+        end
+      end
+    end
+
+    test 'service account credential files are tested for existence' do
+      VCR.use_cassette('valid_kubernetes_api_server') do
+        begin
+          ENV['KUBERNETES_SERVICE_HOST'] = 'localhost'
+          ENV['KUBERNETES_SERVICE_PORT'] = '8443'
+
+          d = create_driver('watch false')
+          assert_equal(d.instance.kubernetes_url, "https://localhost:8443/api")
+          assert_false(d.instance.ca_file.present?)
+          assert_false(d.instance.bearer_token_file.present?)
+        ensure
+          ENV['KUBERNETES_SERVICE_HOST'] = nil
+          ENV['KUBERNETES_SERVICE_PORT'] = nil
+        end
+      end
+    end
   end
 
   sub_test_case 'filter_stream' do

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes_metadata_filter
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Jimmi Dyson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: lru_redux
   requirement: !ruby/object:Gem::Requirement