fluent-plugin-kubernetes-objects 1.1.10 → 1.1.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +15 -11
- data/VERSION +1 -1
- data/fluent-plugin-kubernetes-objects.gemspec +1 -1
- data/lib/fluent/plugin/in_kubernetes_objects.rb +4 -1
- data/test/fluent/plugin/in_kubernetes_objects_test.rb +3 -2
- data/test/test_helper.rb +21 -0
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 168ae6862575cb688a5ace5531696af279ddd206aebcbf766ce180db6701455d
|
4
|
+
data.tar.gz: 101051ee22a5f01605ce41d7ad6a061df76bcccc35c972c478a7423620f205d2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: cd2f8d7394710699313059decd82ad47070dca1af377a6b27b4f08f697eb236c1282e2a84e74c9ffb0671d6b5e7185d241c35327ec93ebf0419a77a9fd30b5f8
|
7
|
+
data.tar.gz: '09e3862f49c87309ab218364d7762ce6b88c2c6731ceb40225637021946fdb2388040bd85c7a4dad4fb0efeea975eff81588d30e2bf94ee4505a60d39fc212f9'
|
data/Gemfile.lock
CHANGED
@@ -1,17 +1,17 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
fluent-plugin-kubernetes-objects (1.1.
|
4
|
+
fluent-plugin-kubernetes-objects (1.1.11)
|
5
5
|
fluentd (>= 1.9.1)
|
6
6
|
http_parser.rb (= 0.5.3)
|
7
|
-
kubeclient (~> 4.
|
7
|
+
kubeclient (~> 4.9.3)
|
8
8
|
|
9
9
|
GEM
|
10
10
|
remote: https://rubygems.org/
|
11
11
|
specs:
|
12
12
|
addressable (2.8.0)
|
13
13
|
public_suffix (>= 2.0.2, < 5.0)
|
14
|
-
concurrent-ruby (1.1.
|
14
|
+
concurrent-ruby (1.1.10)
|
15
15
|
cool.io (1.7.1)
|
16
16
|
crack (0.4.5)
|
17
17
|
rexml
|
@@ -22,12 +22,12 @@ GEM
|
|
22
22
|
ffi-compiler (1.0.1)
|
23
23
|
ffi (>= 1.0.0)
|
24
24
|
rake
|
25
|
-
fluentd (1.14.
|
25
|
+
fluentd (1.14.5)
|
26
26
|
bundler
|
27
27
|
cool.io (>= 1.4.5, < 2.0.0)
|
28
28
|
http_parser.rb (>= 0.5.1, < 0.9.0)
|
29
29
|
msgpack (>= 1.3.1, < 2.0.0)
|
30
|
-
serverengine (>= 2.2.
|
30
|
+
serverengine (>= 2.2.5, < 3.0.0)
|
31
31
|
sigdump (~> 0.2.2)
|
32
32
|
strptime (>= 0.2.4, < 1.0.0)
|
33
33
|
tzinfo (>= 1.0, < 3.0)
|
@@ -47,15 +47,19 @@ GEM
|
|
47
47
|
http-parser (1.2.3)
|
48
48
|
ffi-compiler (>= 1.0, < 2.0)
|
49
49
|
http_parser.rb (0.5.3)
|
50
|
-
|
50
|
+
jsonpath (1.1.0)
|
51
|
+
multi_json
|
52
|
+
kubeclient (4.9.3)
|
51
53
|
http (>= 3.0, < 5.0)
|
52
|
-
|
54
|
+
jsonpath (~> 1.0)
|
55
|
+
recursive-open-struct (~> 1.1, >= 1.1.1)
|
53
56
|
rest-client (~> 2.0)
|
54
57
|
mime-types (3.4.1)
|
55
58
|
mime-types-data (~> 3.2015)
|
56
59
|
mime-types-data (3.2022.0105)
|
57
60
|
minitest (5.14.4)
|
58
|
-
msgpack (1.4.
|
61
|
+
msgpack (1.4.5)
|
62
|
+
multi_json (1.15.0)
|
59
63
|
netrc (0.11.0)
|
60
64
|
power_assert (2.0.1)
|
61
65
|
public_suffix (4.0.6)
|
@@ -81,11 +85,11 @@ GEM
|
|
81
85
|
power_assert
|
82
86
|
tzinfo (2.0.4)
|
83
87
|
concurrent-ruby (~> 1.0)
|
84
|
-
tzinfo-data (1.
|
88
|
+
tzinfo-data (1.2022.1)
|
85
89
|
tzinfo (>= 1.0.0)
|
86
90
|
unf (0.1.4)
|
87
91
|
unf_ext
|
88
|
-
unf_ext (0.0.8)
|
92
|
+
unf_ext (0.0.8.1)
|
89
93
|
webmock (3.14.0)
|
90
94
|
addressable (>= 2.8.0)
|
91
95
|
crack (>= 0.3.2)
|
@@ -106,4 +110,4 @@ DEPENDENCIES
|
|
106
110
|
webmock (~> 3.5)
|
107
111
|
|
108
112
|
BUNDLED WITH
|
109
|
-
2.3.
|
113
|
+
2.3.10
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.1.
|
1
|
+
1.1.11
|
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
|
|
22
22
|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
23
23
|
spec.required_ruby_version = '>= 2.3.0'
|
24
24
|
spec.add_runtime_dependency 'fluentd', '>= 1.9.1'
|
25
|
-
spec.add_runtime_dependency 'kubeclient', '~> 4.
|
25
|
+
spec.add_runtime_dependency 'kubeclient', '~> 4.9.3'
|
26
26
|
spec.add_runtime_dependency 'http_parser.rb', '= 0.5.3'
|
27
27
|
|
28
28
|
spec.add_development_dependency 'bundler', '~> 2.0'
|
@@ -20,6 +20,9 @@ module Fluent::Plugin
|
|
20
20
|
desc 'Kubernetes API version.'
|
21
21
|
config_param :api_version, :string, default: 'v1'
|
22
22
|
|
23
|
+
desc 'Kubernetes API endpoint.'
|
24
|
+
config_param :api_endpoint, :string, default: 'api'
|
25
|
+
|
23
26
|
desc 'Path to the certificate file for this client.'
|
24
27
|
config_param :client_cert, :string, default: nil
|
25
28
|
|
@@ -139,7 +142,7 @@ module Fluent::Plugin
|
|
139
142
|
env_host = ENV['KUBERNETES_SERVICE_HOST']
|
140
143
|
env_port = ENV['KUBERNETES_SERVICE_PORT']
|
141
144
|
if env_host && env_port
|
142
|
-
@kubernetes_url = "https://#{env_host}:#{env_port}/#{@
|
145
|
+
@kubernetes_url = "https://#{env_host}:#{env_port}/#{@api_endpoint.delete_prefix('/')}"
|
143
146
|
end
|
144
147
|
end
|
145
148
|
|
@@ -57,8 +57,9 @@ describe Fluent::Plugin::KubernetesObjectsInput do
|
|
57
57
|
puts 'Test: should use pick the right path'
|
58
58
|
ENV['KUBERNETES_SERVICE_HOST'] = k8s_host
|
59
59
|
ENV['KUBERNETES_SERVICE_PORT'] = k8s_port
|
60
|
-
expect(create_input_driver(<<~CONF).instance.kubernetes_url).must_equal k8s_url('apis')
|
61
|
-
|
60
|
+
expect(create_input_driver(<<~CONF).instance.kubernetes_url).must_equal k8s_url('apis/apps')
|
61
|
+
api_endpoint apis/apps
|
62
|
+
api_version v1
|
62
63
|
<pull>
|
63
64
|
resource_name deployments
|
64
65
|
</pull>
|
data/test/test_helper.rb
CHANGED
@@ -54,6 +54,9 @@ module PluginTestHelper
|
|
54
54
|
stub_k8s_nodes
|
55
55
|
stub_k8s_pods
|
56
56
|
stub_k8s_events
|
57
|
+
stub_k8s_apps
|
58
|
+
stub_k8s_apps_v1
|
59
|
+
stub_k8s_apps_v1_namespace
|
57
60
|
end
|
58
61
|
|
59
62
|
def stub_k8s_api
|
@@ -68,6 +71,24 @@ module PluginTestHelper
|
|
68
71
|
end.close
|
69
72
|
end
|
70
73
|
|
74
|
+
def stub_k8s_apps
|
75
|
+
File.open(File.expand_path('apps.json', __dir__)).tap do |f|
|
76
|
+
stub_request(:get, k8s_url('apis/apps')).to_return(body: f.read)
|
77
|
+
end.close
|
78
|
+
end
|
79
|
+
|
80
|
+
def stub_k8s_apps_v1
|
81
|
+
File.open(File.expand_path('apps-v1.json', __dir__)).tap do |f|
|
82
|
+
stub_request(:get, k8s_url('apis/apps/v1')).to_return(body: f.read)
|
83
|
+
end.close
|
84
|
+
end
|
85
|
+
|
86
|
+
def stub_k8s_apps_v1_namespace
|
87
|
+
File.open(File.expand_path('apps-v1-namespace.json', __dir__)).tap do |f|
|
88
|
+
stub_request(:get, k8s_url('apis/apps')).to_return(body: f.read)
|
89
|
+
end.close
|
90
|
+
end
|
91
|
+
|
71
92
|
def stub_k8s_v1
|
72
93
|
File.open(File.expand_path('v1.json', __dir__)).tap do |f|
|
73
94
|
stub_request(:get, "#{k8s_url}/v1").to_return(body: f.read)
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fluent-plugin-kubernetes-objects
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.
|
4
|
+
version: 1.1.11
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Splunk Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-03-
|
11
|
+
date: 2022-03-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: fluentd
|
@@ -30,14 +30,14 @@ dependencies:
|
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 4.
|
33
|
+
version: 4.9.3
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - "~>"
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: 4.
|
40
|
+
version: 4.9.3
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: http_parser.rb
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|