mkit 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ef8c74fea9d69b3a25c80713f13f4878f590560356a3e588502838500228ceb
-  data.tar.gz: 1c653195f19a36c429387daec3c12153e9394424b5dd0d1edad62f1f9b4fdcea
+  metadata.gz: fbf4273a9458c659131f42dff9f804d23632b282bb6ee04d803c8e8623262fa1
+  data.tar.gz: f9c7cdff9a122c90c714fd16de80bfc07f19ded8d88806d2b7e7f3af2f7dc246
 SHA512:
-  metadata.gz: 7e37a8161aa15681ce9097f900187f8cb77726210466223773d52c311a8acda2936ec8f13f2885d5605222c1dce27f82e700c4a5d31598274acdc10e54b82104
-  data.tar.gz: e53bf5e0a7cd37e703ae0f8600c81085b3ad8617f4fddb261a6f122bea2a959019ba61a6d7408f923e95d349e73600c631899a4f17c547e60d65bb3bdccd5692
+  metadata.gz: e0975eb515e8b4b91006953f293206b02b1b377a3668b8478af9dfa84f9a58216cbbe83928c8458bb3d9676543cb748dedfa00c26f65279ffe59f15f847cab5d
+  data.tar.gz: d790f9aa1edcac942df9a72317295c9c091eb88ec029d2584c0275bbd7740fe94272504a984a3248d0aa1d77949e7343ee189fa0018b5724ecfd0de44308a567

data/README.md

@@ -2,12 +2,12 @@
 
 This is micro kubernetes(tm) on Ruby(tm), a simple tool to deploy containers to mimic a (very) minimalistic k8 cluster with a nice REST API.
 
-It contains a internal DNS and uses HAProxy for routing/balancing/fail-over for Pods access.
+It contains an internal DNS and uses HAProxy for routing/balancing/fail-over for Pods access.
 The database is a simple sqlite3 db and the server is a Sinatra based application.
 
-The client is not done yet, only includes a simple wrapper to `curl`
+A client is also included to access the API, e.g. `mkitc ps`.
 
-The daemon is responsible for HAProxy pods routing configuration. It also provides the cluster DNS and manages the internal host interface. 
+The daemon is responsible for HAProxy pods routing configuration. It also provides the cluster DNS and manages the internal host interface and the docker instances. 
 
 ## Requirements
 
@@ -107,7 +107,11 @@ service:
   name: rabbitmq # unique
   image: rabbitmq:3-management-alpine # image
   network: bridge # docker network - it will be created if it does not exists
-  ports:  # haproxy port mapping: <external_port>|<internal_port>|<tcp|http>|round_robin
+  ports:  # haproxy port mapping
+          #   <external_port>:[internal_port]:<tcp|http>:[round_robin (default)|leastconn]
+          # to define a range on `external_port`, leave `internal_port` blank
+          #   - 5000-5100::tcp:round_robin
+          # range on `internal_port` is not supported 
     - 5672:5672:tcp:round_robin
     - 80:15672:http:round_robin
   resources:

data/lib/mkit/app/controllers/services_controller.rb

@@ -41,9 +41,6 @@ class ServicesController < MKIt::Server
       srv.update!(yaml.to_o)
     end
     format_response(srv)
-  rescue MKIt::BaseException => e
-    MKItLogger.debug e
-    error e.error_code, e.message
   end
 
   # curl -X DELETE localhost:4567/services/1
@@ -62,9 +59,6 @@ class ServicesController < MKIt::Server
       srv = Service.create(yaml.to_o)
     end
     format_response(srv)
-  rescue MKIt::BaseException => e
-    MKItLogger.debug e
-    error e.error_code, e.message
   end
 
   #
@@ -84,4 +78,3 @@ class ServicesController < MKIt::Server
     format_response(srv)
   end
 end
-

data/lib/mkit/app/mkit_server.rb

@@ -3,6 +3,18 @@ require 'mkit/exceptions'
 module MKIt
   class Server < Sinatra::Base
     set :default_content_type, :json
-    # set :dump_errors, false
+    set :dump_errors, true
+    set :show_exceptions, false
+    set :raise_errors, false
+
+    error MKIt::BaseException do |e|
+      MKItLogger.debug e
+      error e.error_code, e.message
+    end
+
+    error do |e|
+      MKItLogger.debug e
+      error 500, "Internal server error: #{e.message}"
+    end
   end
 end

data/lib/mkit/app/model/service.rb

@@ -9,11 +9,7 @@ require 'mkit/status'
 require 'mkit/utils'
 require 'mkit/ctypes'
 require 'mkit/app/model/pool'
-require 'mkit/app/model/service'
-require 'mkit/app/model/pod'
 require 'mkit/app/model/dns_host'
-require 'mkit/app/helpers/erb_helper'
-require 'mkit/app/helpers/docker_helper'
 require 'mkit/app/helpers/haproxy'
 
 #
@@ -38,37 +34,39 @@ class Service < ActiveRecord::Base
     config = yaml["service"]
     raise MKIt::ServiceAlreadyExists.new unless Service.find_by_name(config.name).nil?
 
-    srv = Service.new(
-      name: config.name,
-      version: 1,
-      image: config.image,
-      command: config.command,
-      status: MKIt::Status::CREATING
-    )
-
-    # reserve pool ip
-    srv.lease = Pool.find_by_name(MKIt::Utils.me).reserve_for(srv)
-
-    srv.dns_host = DnsHost.new(
-      service: srv,
-      name: srv.name,
-      ip: srv.lease.ip
-    )
-
-    # create service network
-    srv.deploy_network
-
-    # configure
-    srv.configure(config)
-    #
-    srv.status = MKIt::Status::CREATED
-    srv.save
-    data = { service_id: srv.id, version: srv.version }
-    # create pod
-    (1..srv.min_replicas).each { |i|
-      MkitJob.publish(topic: :create_pod_saga, service_id: srv.id, data: data)
-    }
-    srv
+    ActiveRecord::Base.transaction do
+      srv = Service.new(
+        name: config.name,
+        version: 1,
+        image: config.image,
+        command: config.command,
+        status: MKIt::Status::CREATING
+      )
+
+      # reserve pool ip
+      srv.lease = Pool.find_by_name(MKIt::Utils.me).reserve_for(srv)
+
+      srv.dns_host = DnsHost.new(
+        service: srv,
+        name: srv.name,
+        ip: srv.lease.ip
+      )
+
+      # create service network
+      srv.deploy_network
+
+      # configure
+      srv.configure(config)
+      #
+      srv.status = MKIt::Status::CREATED
+      srv.save!
+      data = { service_id: srv.id, version: srv.version }
+      # create pod
+      (1..srv.min_replicas).each { |i|
+        MkitJob.publish(topic: :create_pod_saga, service_id: srv.id, data: data)
+      }
+      srv
+    end
   end
 
   def configure(config)
@@ -115,19 +113,21 @@ class Service < ActiveRecord::Base
   end
 
   def update!(yaml)
-    config = yaml["service"]
-    raise MKIt::ServiceNameMismatch.new unless config.name == self.name
-    self.version+=1
-    self.configure(config)
-
-    # start new pod, destroy old pod...
-    self.pod.each { |pod| MkitJob.publish(topic: :destroy_pod, pod_id: pod.id, data: {}) }
-    # create pod
-    data = { service_id: self.id, version: self.version }
-    (1..self.min_replicas).each { |i|
-      MkitJob.publish(topic: :create_pod_saga, service_id: self.id, data: data)
-    }
-    self.save
+    ActiveRecord::Base.transaction do
+      config = yaml["service"]
+      raise MKIt::ServiceNameMismatch.new unless config.name == self.name
+      self.version+=1
+      self.configure(config)
+
+      # start new pod, destroy old pod...
+      self.pod.each { |pod| MkitJob.publish(topic: :destroy_pod, pod_id: pod.id, data: {}) }
+      # create pod
+      data = { service_id: self.id, version: self.version }
+      (1..self.min_replicas).each { |i|
+        MkitJob.publish(topic: :create_pod_saga, service_id: self.id, data: data)
+      }
+      self.save
+    end
   end
 
   def create_pods_network
@@ -199,19 +199,6 @@ class Service < ActiveRecord::Base
   #
   # ha proxy configs & template
   #
-  def public_ports
-    self.service_port.each.map{|p| p.external_port}.uniq
-  end
-
-  def ports_by_external(external_port)
-    self.service_port.where('external_port = ?', external_port)
-  end
-
-  def ports_mode_by_external(external_port)
-    ports = self.service_port.where('external_port = ?', external_port).first
-    ports.mode if ports
-  end
-
   def update_proxy
     MkitJob.publish(topic: :update_proxy_config, application_id: self.id, data: proxy_config)
   end

data/lib/mkit/app/model/service_port.rb

@@ -1,30 +1,47 @@
 require 'mkit/app/model/service'
+require 'mkit/exceptions'
 
 class ServicePort < ActiveRecord::Base
   belongs_to :service
 
+  CONFIG_EXPRESSION=/^(.*?):(.*?):(tcp|http):(.*?)$/
+
   def self.create(service:, config:)
     sp = ServicePort.new(service: service, version: service.version)
     sp.parse_config(config)
     sp
   end
 
-  # haproxy support for port range - leave src blank
+  # haproxy support for port range - leave dest blank
   # service:
   #   ports:
-  #     # src:dest:tcp|http:load-balancing
+  #     # src:dest:tcp|http:round_robin|leastconn
   #     - 5532:5432:tcp:round_robin
+  #     - 5532-6000::tcp:round_robin
   # model:
   #  service_ports:
   #     - external: 5432
   #       internal: 5432
   #       mode: tcp|http
-  #       load_bal:
+  #       load_bal: round_robin
   def parse_config(config)
-    ports = config.split(':')
-    self.external_port = ports[0]
-    self.internal_port = ports[1]
-    self.mode = ports[2]
-    self.load_bal = ports[3]
+    ports = config.match(CONFIG_EXPRESSION)
+    raise MKIt::InvalidPortsConfiguration.new("no match with config expression $#{CONFIG_EXPRESSION}") if ports.nil?
+
+    self.external_port = ports[1]
+    self.internal_port = ports[2]
+    self.mode = ports[3]
+    self.load_bal = ports[4]
+  end
+
+  def load_balance
+    case self.load_bal
+    when /^round_robin$/
+      "roundrobin"
+    when /^leastconn$/
+      "leastconn"
+    else
+      "roundrobin"
+    end
   end
 end

data/lib/mkit/app/templates/haproxy/xapp_haproxy.cfg.erb

@@ -1,30 +1,27 @@
 #
 # MKIt generated file
 #
-<% public_ports.each { |external_port|%>
+<% service_port.each { |port|%>
 #
-# start <%=name%>-<%=external_port%>
+# start <%=name%>-<%=port.external_port%>
 #
-frontend <%=name%>-<%=external_port%>-front
-  bind <%=lease.ip%>:<%=external_port%>
-  mode <%=ports_mode_by_external(external_port)%>
+frontend <%=name%>-<%=port.external_port%>-front
+  bind <%=lease.ip%>:<%=port.external_port%>
+  mode <%=port.mode%>
   #
-  use_backend <%=name%>-<%=external_port%>-back
+  use_backend <%=name%>-<%=port.external_port%>-back
 
-backend <%=name%>-<%=external_port%>-back
-   mode <%=ports_mode_by_external(external_port)%>
-   #balance leastconn
-   balance  roundrobin
- <%if ports_mode_by_external(external_port) == 'http'%>
-   option httpclose
-   option forwardfor
-   cookie JSESSIONID prefix
- <%end%>
-<%ports_by_external(external_port).each { |port| %>
-   <%port.service.pod.each { | pod | %>
-   server <%=pod.name%>  <%=pod.ip%>:<%=port.internal_port%> <%if port.mode == 'http'%>cookie A<%end%>  check<%}%><%}%>
-# 
-# end of <%=name%>-<%=external_port%>
+backend <%=name%>-<%=port.external_port%>-back
+  mode <%=port.mode%>
+  balance <%=port.load_balance%>
+ <%if port.mode == 'http'%>
+  option httpclose
+  option forwardfor
+  cookie JSESSIONID prefix
+ <%end%><%port.service.pod.each { | pod | %>
+  server <%=pod.name%>  <%=pod.ip%><%unless port.internal_port.nil? || port.internal_port.empty? then%><%=":#{port.internal_port}"%> <%if port.mode == 'http'%>cookie A<%end%> check<%end%>
+  <%}%>
 #
-<%}%>
-
+# end of <%=name%>-<%=port.external_port%>
+#
+<%}%>

data/lib/mkit/exceptions.rb

@@ -17,6 +17,11 @@ module MKIt
       super(400, message)
     end
   end
+  class InvalidPortsConfiguration < BaseException
+    def initialize(message = nil)
+      super(400, message)
+    end
+  end
   class ServiceNotFoundException < StandardError; end
   class PodNotFoundException     < StandardError; end
   class AppAlreadyDeployedException < StandardError; end

data/lib/mkit/version.rb

@@ -1,4 +1,4 @@
 module MKIt
-  VERSION = "0.3.0"
+  VERSION = "0.4.1"
 end
 

data/lib/mkit.rb

@@ -110,6 +110,9 @@ module MKIt
       srv.deploy_network
       srv.update_status!
     }
+    # daemontools would eventually start haproxy; systemd does not.
+    # so, restart here.
+    MKIt::HAProxy.restart
   end
 
   def self.startup(options: {})

data/mkit.gemspec

@@ -6,12 +6,12 @@ require "mkit/version"
 
 Gem::Specification.new do |s|
         s.name         = 'mkit'
-        s.summary      = 'micro kubernets'
+        s.summary      = 'Micro Kubernets on Ruby'
         s.bindir       = 'bin'
-        s.homepage     = 'http://vars.pt'
+        s.homepage     = 'https://github.com/valexsantos/mkit'
         s.license      = 'Apache-2.0'
         s.rubyforge_project = ''
-        s.description  = 'micro kubernets impl'
+        s.description  = 'Micro k8s on Ruby - a simple tool to deploy containers to mimic a (very) minimalistic k8 cluster with a nice REST API'
         # s.require_paths = ["."]
         s.author      = 'Vasco Santos'
         s.email        = ['valexsantos@gmail.com']

data/samples/apps/rabbitmq.yml

@@ -2,7 +2,7 @@
 service:
   name: rabbitmq
   image: rabbitmq:3-management-alpine
-  network: rabbitmq # docker network
+  network: bridge # docker network
   ports:
     - 5672:5672:tcp:round_robin
     - 80:15672:http:round_robin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mkit
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Vasco Santos
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ping
@@ -290,7 +290,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.2
-description: micro kubernets impl
+description: Micro k8s on Ruby - a simple tool to deploy containers to mimic a (very)
+  minimalistic k8 cluster with a nice REST API
 email:
 - valexsantos@gmail.com
 executables:
@@ -367,11 +368,11 @@ files:
 - samples/daemontools/log/run
 - samples/daemontools/run
 - samples/systemd/mkitd.service
-homepage: http://vars.pt
+homepage: https://github.com/valexsantos/mkit
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -386,8 +387,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.3.5
+signing_key: 
 specification_version: 4
-summary: micro kubernets
+summary: Micro Kubernets on Ruby
 test_files: []