kumonos 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ae6c918ccb97a3cd8816f306186687047f0056b26453e5cfa252b265db6e880
-  data.tar.gz: ea06b00a734ff9cc2254963219371a241ffd5cfb5ddf4a3264d40d05330d9c68
+  metadata.gz: 9089dbc458f5d49fa8de5bafa4172405f30e1d8e90016a28ff8da33e93cb79dc
+  data.tar.gz: c9291c46d72a253a4437e202de8868e159960fde7858591584058966fd9c9696
 SHA512:
-  metadata.gz: 863c660c821ced47c7074b9b76181972a0d98aab54015306d0fa2a55660c80bcf29f9933dc51fbb371aab192c14970dffe60265041a43b1a895e40f5a39653f6
-  data.tar.gz: a682fdf456af8ce0fb304a106e187f6ab5e597abe91466bf1e855b6db23f9227c337b18ea550a2e047d21c7eaf45eb7ea6c49b7ca3c47c92bdb5d0c0e471e430
+  metadata.gz: d63c045610a4e4c17b9b02a697edca55feeab97a14ed41f4a68e5d44355f9124a8649ae81347845ce86114135f0e4af9ce937188c73dd1ae2e4784e9693089eb
+  data.tar.gz: bb62d41d6f18a8f83fbcda3f506f83ce43eaa390b4af7a4e3450312e51a06136ceea45c52ac28abafe0741cfe6f16bed5acf7ca101d6a6ed17a240f3db51751a

data/example/book.yml

@@ -4,7 +4,7 @@ version: 1
 dependencies:
   - name: 'user'
     cluster_name: 'user-development'
-    lb: 'user-app:8080'
+    sds: true
     tls: false
     connect_timeout_ms: 250
     circuit_breaker:

data/example/envoy_config.yml

@@ -8,7 +8,12 @@ admin:
 discovery_service:
   lb: nginx:80
   tls: false
-  refresh_delay_ms: 30000
+  refresh_delay_ms: 10000
+  connect_timeout_ms: 1000
+sds:
+  lb: sds:8080
+  tls: false
+  refresh_delay_ms: 1000
   connect_timeout_ms: 1000
 statsd:
   address: statsd-exporter:9125

data/exe/kumonos

@@ -64,6 +64,7 @@ class KumonosCli < Thor
     definition['dependencies'] = definition.fetch('dependencies')[0..0]
     dep = definition['dependencies'][0]
     dep['name'] = 'target-service-name'
+    dep['cluster_name'] = 'target-service-name-staging'
     dep['lb'] = 'hostname-for-load-balancer:port'
     path = "#{name}.yml"
     File.open(path, 'w') { |f| YAML.dump(definition, f) }

data/lib/kumonos/clusters.rb

@@ -9,15 +9,19 @@ module Kumonos
       end
     end
 
-    Cluster = Struct.new(:name, :connect_timeout_ms, :lb, :tls, :circuit_breaker) do
+    Cluster = Struct.new(:name, :connect_timeout_ms, :lb, :tls, :circuit_breaker, :use_sds) do
       class << self
         def build(h)
+          use_sds = h.fetch('sds', false)
+          lb = use_sds ? nil : h.fetch('lb')
+
           new(
             h.fetch('cluster_name'),
             h.fetch('connect_timeout_ms'),
-            h.fetch('lb'),
+            lb,
             h.fetch('tls'),
-            CircuitBreaker.build(h.fetch('circuit_breaker'))
+            CircuitBreaker.build(h.fetch('circuit_breaker')),
+            use_sds
           )
         end
       end
@@ -26,10 +30,16 @@ module Kumonos
         h = super
 
         h.delete(:lb)
-        h[:type] = 'strict_dns'
-        h[:lb_type] = 'round_robin'
-        h[:hosts] = [{ url: "tcp://#{lb}" }]
+        h.delete(:use_sds)
+        if use_sds
+          h[:type] = 'sds'
+          h[:service_name] = name
+        else
+          h[:type] = 'strict_dns'
+          h[:hosts] = [{ url: "tcp://#{lb}" }]
+        end
 
+        h[:lb_type] = 'round_robin'
         h.delete(:tls)
         h[:ssl_context] = {} if tls
 

data/lib/kumonos/envoy.rb

@@ -7,10 +7,11 @@ module Kumonos
       end
     end
 
-    EnvoyConfig = Struct.new(:version, :discovery_service, :statsd, :listener, :admin, :cluster, :node) do
+    EnvoyConfig = Struct.new(:version, :discovery_service, :statsd, :listener, :admin, :cluster, :node, :sds) do
       class << self
         def build(h, cluster:, node:)
           discovery_service = DiscoverService.build(h.fetch('discovery_service'))
+          sds = DiscoverService.build(h.fetch('sds'))
           new(
             h.fetch('version'),
             discovery_service,
@@ -18,7 +19,8 @@ module Kumonos
             Listener.build(h.fetch('listener'), discovery_service),
             Admin.build(h.fetch('admin')),
             cluster,
-            node
+            node,
+            sds
           )
         end
 
@@ -40,6 +42,7 @@ module Kumonos
         h = super
         h.delete(:version)
         h.delete(:discovery_service)
+        h.delete(:sds)
         h.delete(:statsd)
         h.delete(:listener)
         h.delete(:cluster)
@@ -47,7 +50,7 @@ module Kumonos
         h[:admin] = admin.to_h
         h[:static_resources] = {
           listeners: [listener.to_h],
-          clusters: [discovery_service.cluster.to_h]
+          clusters: [discovery_service.cluster.to_h, sds.cluster.to_h]
         }
         h[:dynamic_resources] = {
           cds_config: {
@@ -57,6 +60,16 @@ module Kumonos
                 seconds: discovery_service.refresh_delay_ms / 1000.0
               }
             }
+          },
+          deprecated_v1: {
+            sds_config: {
+              api_config_source: {
+                cluster_names: [sds.cluster.name],
+                refresh_delay: {
+                  seconds: sds.refresh_delay_ms / 1000.0
+                }
+              }
+            }
           }
         }
 

data/lib/kumonos/version.rb

@@ -1,3 +1,3 @@
 module Kumonos
-  VERSION = '0.13.0'.freeze
+  VERSION = '0.14.0'.freeze
 end

data/lib/schemas/envoy.json

@@ -8,7 +8,8 @@
     "version",
     "listener",
     "admin",
-    "discovery_service"
+    "discovery_service",
+    "sds"
   ],
   "properties": {
     "version": {
@@ -82,6 +83,35 @@
         }
       }
     },
+    "sds": {
+      "type": "object",
+      "id": "/properties/sds",
+      "additionalProperties": false,
+      "required": [
+        "lb",
+        "tls",
+        "refresh_delay_ms",
+        "connect_timeout_ms"
+      ],
+      "properties": {
+        "lb": {
+          "type": "string",
+          "id": "/properties/sds/properties/properties/lb"
+        },
+        "tls": {
+          "type": "boolean",
+          "id": "/properties/sds/properties/properties/tls"
+        },
+        "refresh_delay_ms": {
+          "type": "integer",
+          "id": "/properties/sds/properties/refresh_delay_ms"
+        },
+        "connect_timeout_ms": {
+          "type": "integer",
+          "id": "/properties/sds/properties/properties/connect_timeout_ms"
+        }
+      }
+    },
     "statsd": {
       "type": "object",
       "id": "/properties/statsd",

data/lib/schemas/service_definition.json

@@ -20,11 +20,10 @@
       "items": {
         "type": "object",
         "id": "/properties/dependencies/items",
-        "additionalProperties": false,
+        "additionalProperties": true,
         "required": [
           "name",
           "cluster_name",
-          "lb",
           "tls",
           "connect_timeout_ms",
           "circuit_breaker",
@@ -41,6 +40,11 @@
             "id": "/properties/dependencies/items/properties/name",
             "default": "dependency-service-name-development"
           },
+          "sds": {
+            "type": "boolean",
+            "id": "/properties/dependencies/items/properties/sds",
+            "default": false
+          },
           "lb": {
             "type": "string",
             "id": "/properties/dependencies/items/properties/lb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumonos
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Taiki Ono
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema