kumonos 0.8.0 → 0.8.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/exe/kumonos +2 -4
- data/lib/kumonos/clusters.rb +37 -15
- data/lib/kumonos/envoy.rb +101 -37
- data/lib/kumonos/routes.rb +42 -22
- data/lib/kumonos/version.rb +1 -1
- data/lib/kumonos.rb +0 -1
- metadata +3 -4
- data/lib/kumonos/envoy_definition.rb +0 -36
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: afaa277aeea2b85f5bc5620bdb387aa5a9d0a26e
|
4
|
+
data.tar.gz: 3819d46ee9f7b0dc92b2509e75661be77212e9ca
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a39107a4642db4fb6129956013e248b2737edc05589025fcaa2afd707f8461fced00bb3c335cec08826aa69e6792b5dd6ff53060088cf0248e208613dca40e3b
|
7
|
+
data.tar.gz: deee3de7fdb0e54a86a6902a0ba037a2c5b69d617c07b9141ebb12d40abb43aa8ab8a9783805b9d4efd4eac590210aa3fa8689a6267378152f0d84b5d3782902
|
data/exe/kumonos
CHANGED
@@ -14,10 +14,8 @@ class KumonosCli < Thor
|
|
14
14
|
desc 'envoy ENVOY_DEFINITION', 'Generate envoy configuration'
|
15
15
|
def envoy(path)
|
16
16
|
validate_path!(path)
|
17
|
-
|
18
|
-
validate_envoy_definition!(
|
19
|
-
|
20
|
-
definition = Kumonos::EnvoyDefinition.from_hash(h)
|
17
|
+
definition = JSON.parse(File.read(path))
|
18
|
+
validate_envoy_definition!(definition, path)
|
21
19
|
puts JSON.dump(Kumonos::Envoy.generate(definition))
|
22
20
|
end
|
23
21
|
|
data/lib/kumonos/clusters.rb
CHANGED
@@ -4,25 +4,47 @@ module Kumonos
|
|
4
4
|
class << self
|
5
5
|
def generate(definition)
|
6
6
|
{
|
7
|
-
clusters: definition['dependencies'].map { |s|
|
7
|
+
clusters: definition['dependencies'].map { |s| Cluster.build(s).to_h }
|
8
8
|
}
|
9
9
|
end
|
10
|
+
end
|
10
11
|
|
11
|
-
|
12
|
+
Cluster = Struct.new(:name, :connect_timeout_ms, :lb, :tls, :circuit_breaker) do
|
13
|
+
class << self
|
14
|
+
def build(h)
|
15
|
+
new(
|
16
|
+
h.fetch('name'),
|
17
|
+
h.fetch('connect_timeout_ms'),
|
18
|
+
h.fetch('lb'),
|
19
|
+
h.fetch('tls'),
|
20
|
+
CircuitBreaker.build(h.fetch('circuit_breaker'))
|
21
|
+
)
|
22
|
+
end
|
23
|
+
end
|
12
24
|
|
13
|
-
def
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
25
|
+
def to_h
|
26
|
+
h = super
|
27
|
+
|
28
|
+
h.delete(:lb)
|
29
|
+
h[:type] = 'strict_dns'
|
30
|
+
h[:lb_type] = 'round_robin'
|
31
|
+
h[:hosts] = [{ url: "tcp://#{lb}" }]
|
32
|
+
|
33
|
+
h.delete(:tls)
|
34
|
+
h[:ssl_context] = {} if tls
|
35
|
+
|
36
|
+
h.delete(:circuit_breaker)
|
37
|
+
h[:circuit_breakers] = { default: circuit_breaker.to_h }
|
38
|
+
|
39
|
+
h
|
40
|
+
end
|
41
|
+
end
|
42
|
+
|
43
|
+
CircuitBreaker = Struct.new(:max_connections, :max_pending_requests, :max_retries) do
|
44
|
+
class << self
|
45
|
+
def build(h)
|
46
|
+
new(h.fetch('max_connections'), h.fetch('max_pending_requests'), h.fetch('max_retries'))
|
47
|
+
end
|
26
48
|
end
|
27
49
|
end
|
28
50
|
end
|
data/lib/kumonos/envoy.rb
CHANGED
@@ -2,49 +2,113 @@ module Kumonos
|
|
2
2
|
# Generate envoy configuration.
|
3
3
|
module Envoy
|
4
4
|
class << self
|
5
|
-
# @param [Kumonos::EnvoyDefinition] definition
|
6
|
-
# @return [Hash] envoy configuration hash
|
7
5
|
def generate(definition)
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
6
|
+
EnvoyConfig.build(definition).to_h
|
7
|
+
end
|
8
|
+
end
|
9
|
+
|
10
|
+
EnvoyConfig = Struct.new(:version, :ds, :statsd, :listener, :admin) do
|
11
|
+
class << self
|
12
|
+
def build(h)
|
13
|
+
ds = DiscoverService.build(h.fetch('ds'))
|
14
|
+
new(
|
15
|
+
h.fetch('version'),
|
16
|
+
ds,
|
17
|
+
h['statsd'] ? Cluster.build(h['statsd']) : nil,
|
18
|
+
Listener.build(h.fetch('listener'), ds),
|
19
|
+
Admin.build(h.fetch('admin'))
|
20
|
+
)
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
def to_h
|
25
|
+
h = super
|
26
|
+
h.delete(:version)
|
27
|
+
h.delete(:ds)
|
28
|
+
h.delete(:statsd)
|
29
|
+
h.delete(:listener)
|
30
|
+
h[:admin] = admin.to_h
|
31
|
+
h[:listeners] = [listener.to_h]
|
32
|
+
h[:cluster_manager] = { cds: ds.to_h, clusters: [] }
|
33
|
+
|
34
|
+
if statsd
|
35
|
+
h[:statsd_tcp_cluster_name] = statsd.name
|
36
|
+
h[:cluster_manager][:clusters] << statsd.to_h
|
37
|
+
end
|
38
|
+
|
39
|
+
h
|
40
|
+
end
|
41
|
+
end
|
42
|
+
|
43
|
+
Listener = Struct.new(:address, :access_log_path, :ds) do
|
44
|
+
class << self
|
45
|
+
def build(h, ds)
|
46
|
+
new(h.fetch('address'), h.fetch('access_log_path'), ds)
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
def to_h
|
51
|
+
h = super
|
52
|
+
h.delete(:ds)
|
53
|
+
h.delete(:access_log_path)
|
54
|
+
h[:filters] = [
|
55
|
+
{
|
56
|
+
type: 'read',
|
57
|
+
name: 'http_connection_manager',
|
58
|
+
config: {
|
59
|
+
codec_type: 'auto',
|
60
|
+
stat_prefix: 'ingress_http',
|
61
|
+
access_log: [{ path: access_log_path }],
|
62
|
+
rds: {
|
63
|
+
cluster: ds.cluster.name,
|
64
|
+
route_config_name: DEFAULT_ROUTE_NAME,
|
65
|
+
refresh_delay_ms: ds.refresh_delay_ms
|
66
|
+
},
|
67
|
+
filters: [{ type: 'decoder', name: 'router', config: {} }]
|
38
68
|
}
|
39
69
|
}
|
40
|
-
|
70
|
+
]
|
71
|
+
h
|
72
|
+
end
|
73
|
+
end
|
41
74
|
|
42
|
-
|
43
|
-
|
44
|
-
|
75
|
+
DiscoverService = Struct.new(:refresh_delay_ms, :cluster) do
|
76
|
+
class << self
|
77
|
+
def build(h)
|
78
|
+
new(h.fetch('refresh_delay_ms'), Cluster.build(h.fetch('cluster')))
|
45
79
|
end
|
80
|
+
end
|
46
81
|
|
47
|
-
|
82
|
+
def to_h
|
83
|
+
h = super
|
84
|
+
h[:cluster] = cluster.to_h
|
85
|
+
h
|
86
|
+
end
|
87
|
+
end
|
88
|
+
|
89
|
+
Cluster = Struct.new(:name, :type, :tls, :connect_timeout_ms, :lb_type, :hosts) do
|
90
|
+
class << self
|
91
|
+
def build(h)
|
92
|
+
new(h.fetch('name'), h.fetch('type'), h.fetch('tls'), h.fetch('connect_timeout_ms'), h.fetch('lb_type'), h.fetch('hosts'))
|
93
|
+
end
|
94
|
+
end
|
95
|
+
|
96
|
+
def to_h
|
97
|
+
h = super
|
98
|
+
if tls
|
99
|
+
cluster[:ssl_context] = {}
|
100
|
+
else
|
101
|
+
h.delete(:tls)
|
102
|
+
end
|
103
|
+
h
|
104
|
+
end
|
105
|
+
end
|
106
|
+
|
107
|
+
Admin = Struct.new(:address, :access_log_path) do
|
108
|
+
class << self
|
109
|
+
def build(h)
|
110
|
+
new(h.fetch('address'), h.fetch('access_log_path'))
|
111
|
+
end
|
48
112
|
end
|
49
113
|
end
|
50
114
|
end
|
data/lib/kumonos/routes.rb
CHANGED
@@ -5,34 +5,54 @@ module Kumonos
|
|
5
5
|
def generate(definition)
|
6
6
|
{
|
7
7
|
validate_clusters: false,
|
8
|
-
virtual_hosts: definition['dependencies'].map { |s|
|
8
|
+
virtual_hosts: definition['dependencies'].map { |s| Vhost.build(s).to_h }
|
9
9
|
}
|
10
10
|
end
|
11
|
+
end
|
11
12
|
|
12
|
-
|
13
|
+
Vhost = Struct.new(:name, :domains, :routes) do
|
14
|
+
class << self
|
15
|
+
def build(h)
|
16
|
+
name = h.fetch('name')
|
17
|
+
routes = h.fetch('routes').map { |r| Route.build(r, name) }
|
18
|
+
new(name, [name], routes)
|
19
|
+
end
|
20
|
+
end
|
13
21
|
|
14
|
-
def
|
15
|
-
|
16
|
-
{
|
17
|
-
|
18
|
-
domains: [name],
|
19
|
-
routes: service['routes'].flat_map { |r| split_route(r, name) }
|
20
|
-
}
|
22
|
+
def to_h
|
23
|
+
h = super
|
24
|
+
h[:routes] = routes.flat_map { |r| [r.to_h_with_retry, r.to_h] }
|
25
|
+
h
|
21
26
|
end
|
27
|
+
end
|
22
28
|
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
prefix
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
29
|
+
Route = Struct.new(:prefix, :cluster, :timeout_ms, :retry_policy) do
|
30
|
+
class << self
|
31
|
+
def build(h, cluster)
|
32
|
+
new(h.fetch('prefix'), cluster, h.fetch('timeout_ms'), RetryPolicy.build(h.fetch('retry_policy')))
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
36
|
+
def to_h
|
37
|
+
h = super
|
38
|
+
h.delete(:retry_policy)
|
39
|
+
h[:auto_host_rewrite] = true
|
40
|
+
h
|
41
|
+
end
|
42
|
+
|
43
|
+
def to_h_with_retry
|
44
|
+
h = to_h
|
45
|
+
h[:retry_policy] = retry_policy.to_h
|
46
|
+
h[:headers] = [{ name: ':method', value: '(GET|HEAD)', regex: true }]
|
47
|
+
h
|
48
|
+
end
|
49
|
+
end
|
50
|
+
|
51
|
+
RetryPolicy = Struct.new(:retry_on, :num_retries, :per_try_timeout_ms) do
|
52
|
+
class << self
|
53
|
+
def build(h)
|
54
|
+
new(h.fetch('retry_on'), h.fetch('num_retries'), h.fetch('per_try_timeout_ms'))
|
55
|
+
end
|
36
56
|
end
|
37
57
|
end
|
38
58
|
end
|
data/lib/kumonos/version.rb
CHANGED
data/lib/kumonos.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kumonos
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.8.
|
4
|
+
version: 0.8.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Taiki Ono
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-11-
|
11
|
+
date: 2017-11-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: json-schema
|
@@ -167,7 +167,6 @@ files:
|
|
167
167
|
- lib/kumonos.rb
|
168
168
|
- lib/kumonos/clusters.rb
|
169
169
|
- lib/kumonos/envoy.rb
|
170
|
-
- lib/kumonos/envoy_definition.rb
|
171
170
|
- lib/kumonos/output.rb
|
172
171
|
- lib/kumonos/routes.rb
|
173
172
|
- lib/kumonos/schemas.rb
|
@@ -194,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
194
193
|
version: '0'
|
195
194
|
requirements: []
|
196
195
|
rubyforge_project:
|
197
|
-
rubygems_version: 2.
|
196
|
+
rubygems_version: 2.6.13
|
198
197
|
signing_key:
|
199
198
|
specification_version: 4
|
200
199
|
summary: A "control plane" for Microservices "service mesh".
|
@@ -1,36 +0,0 @@
|
|
1
|
-
module Kumonos
|
2
|
-
EnvoyDefinition = Struct.new(:version, :ds, :statsd, :listener, :admin) do
|
3
|
-
class << self
|
4
|
-
def from_hash(h)
|
5
|
-
ds = symbolize_keys(h.fetch('ds'))
|
6
|
-
convert_tls_option!(ds.fetch(:cluster))
|
7
|
-
|
8
|
-
new(
|
9
|
-
h.fetch('version'),
|
10
|
-
ds,
|
11
|
-
convert_tls_option!(symbolize_keys(h.fetch('statsd', {}))),
|
12
|
-
symbolize_keys(h.fetch('listener')),
|
13
|
-
symbolize_keys(h.fetch('admin'))
|
14
|
-
)
|
15
|
-
end
|
16
|
-
|
17
|
-
private
|
18
|
-
|
19
|
-
def convert_tls_option!(cluster)
|
20
|
-
tls = cluster.delete(:tls)
|
21
|
-
cluster[:ssl_context] = {} if tls
|
22
|
-
cluster
|
23
|
-
end
|
24
|
-
|
25
|
-
def symbolize_keys(hash)
|
26
|
-
new = hash.map do |k, v|
|
27
|
-
[
|
28
|
-
k.to_sym,
|
29
|
-
v.is_a?(Hash) ? symbolize_keys(v) : v
|
30
|
-
]
|
31
|
-
end
|
32
|
-
new.to_h
|
33
|
-
end
|
34
|
-
end
|
35
|
-
end
|
36
|
-
end
|