mkit 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03e23a426169a1815c4f92ef46461db9275e60aabe3ac62e9eb57d5a36e34ded
-  data.tar.gz: f05140fed7e69015dcfe19e2f9d52498a7cf260da0ffb31fbcbaddf505f204f0
+  metadata.gz: 6ef8c74fea9d69b3a25c80713f13f4878f590560356a3e588502838500228ceb
+  data.tar.gz: 1c653195f19a36c429387daec3c12153e9394424b5dd0d1edad62f1f9b4fdcea
 SHA512:
-  metadata.gz: dcfb2eca9b54bd5871c9899640abba32e6da653f3db94ba9701ccc7271225d0634c77361444c1683f1f71bb138afc4e3d86e416fb930a3f6bf74a6bd93449974
-  data.tar.gz: 9d3efacb12c9dc6959501101d3f2ad31b8367909beb36eb139d7a702e57ad05046363330d253dc6f39c163541c24d62f42ce780aca900ca82754054b93ed4404
+  metadata.gz: 7e37a8161aa15681ce9097f900187f8cb77726210466223773d52c311a8acda2936ec8f13f2885d5605222c1dce27f82e700c4a5d31598274acdc10e54b82104
+  data.tar.gz: e53bf5e0a7cd37e703ae0f8600c81085b3ad8617f4fddb261a6f122bea2a959019ba61a6d7408f923e95d349e73600c631899a4f17c547e60d65bb3bdccd5692

data/README.md

@@ -16,9 +16,16 @@ The daemon is responsible for HAProxy pods routing configuration. It also provid
 * Docker
 * Linux (iproute2 package)
 
+## Install
+
+This is a simple ruby gem, so to install run
+```
+# gem install mkit
+```
+
 ## Running
 
-The `daemon` requires `root` user, you can run it directly on the repository root...
+The `daemon` requires `root` user (due to `ip` and `haproxy`), you can run it directly on the repository root...
 
 ```
 # ./mkitd  --help
@@ -47,22 +54,23 @@ There's also samples on the samples dir, for daemontools and systemd.
 ### Accessing the API
 
 * Create new service
-  * `mkitc POST services -F "file=@samples/apps/rabbitmq.yml"`
+  * `mkitc create samples/apps/rabbitmq.yml`
 * Update service
-  * `mkitc PUT services/{id|service_name} -F "file=@samples/apps/rabbitmq.yml"`
-* Get services
-  * `mkitc GET services/{id|service_name}[?verbose=true]`
+  * `mkitc update samples/apps/rabbitmq.yml`
+* Get service
+  * `mkitc ps {id|service_name}`
 * Delete service
-  * `mkitc DELETE services/{id|service_name}`
+  * `mkitc rm {id|service_name}`
 * List services
-  * `mkitc GET services?verbose=true`
+  * `mkitc ps [-v (verbose)]`
 * Control service
-  * `mkitc PUT services/{id|service_name}/start`
-  * `mkitc PUT services/{id|service_name}/stop`
+  * `mkitc start {id|service_name}`
+  * `mkitc stop {id|service_name}`
 
 Example:
 
 ```
+$ mkitc ps postgres
 id      name                 addr             ports                      status
 4       postgres             10.210.198.10    tcp/5432                   RUNNING
   pods
@@ -98,7 +106,7 @@ CONFIG="/etc/haproxy/haproxy.d"
 service:
   name: rabbitmq # unique
   image: rabbitmq:3-management-alpine # image
-  network: bridge # docker network
+  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
     - 5672:5672:tcp:round_robin
     - 80:15672:http:round_robin
@@ -106,7 +114,7 @@ service:
     max_replicas: 1
     min_replicas: 1
   volumes:
-    - docker://mkit_rabbitmq_data:/var/lib/rabbitmq # a docker volume
+    - docker://mkit_rabbitmq_data:/var/lib/rabbitmq # a docker volume - it will be created if it does not exists
     - /var/log/rabbitmq/logs:/var/log/rabbitmq # a local volume
   environment:
     RABBITMQ_DEFAULT_USER: admin

data/bin/mkitc

@@ -2,30 +2,157 @@
 # frozen_string_literal: true
 
 require 'rubygems'
+require 'optparse'
+require 'yaml'
+require 'net/http'
+require 'json'
+require 'net_http_unix'
+require 'securerandom'
 
 class MKItClient
 
-  VERBS = %w{GET POST PUT DELETE}
-  def usage
-    puts 
-    puts  "usage: mkitc <verb> <path>"
-    puts  "  where <verb> is one of GET | POST | PUT | DELETE"
-    puts  "e.g."
-    puts  "  mkitc GET applications"
-    puts 
+  def initialize
+    @client = NetX::HTTPUnix.new("localhost",4567)
   end
 
-  def run
-    if ARGV.size < 2 || VERBS.index(ARGV[0]).nil?
-      usage
-      exit 1
+  def parse_args(args)
+    request = nil
+    case args[0]
+    when /^ps$/
+      if args.include?('-v')
+        params = {verbose: 'true'}
+        args.delete('-v')
+      else
+        params = {}
+      end
+      case args.size
+      when 1
+        #mkitc ps [-v] GET services[?verbose=true]
+        request = { verb: :get, uri: '/services', params: params }
+      when 2
+        #mkitc ps {id} GET services/{id}
+        id = args[1]
+        request = { verb: :get, uri: "/services/#{id}" }
+      else
+        raise 'invalid parameters'
+      end
+    when /^config:show$/
+      #mkitc config:show {id} => GET services/{id}/config
+      #TODO
+    when /^stop$/
+      #mkitc stop  {id} => PUT services/{id}/stop
+      case args.size
+      when 2
+        id = args[1]
+        request = { verb: :put, uri: "/services/#{id}/stop" }
+      else
+        raise 'invalid parameters'
+      end
+    when /^start$/
+      #mkitc start {id} => PUT services/{id}/start
+      case args.size
+      when 2
+        id = args[1]
+        request = { verb: :put, uri: "/services/#{id}/start" }
+      else
+        raise 'invalid parameters'
+      end
+    when /^rm$/
+      #mkitc rm {id} => DELETE services/{id}
+      case args.size
+      when 2
+        id = args[1]
+        request = { verb: :delete, uri: "/services/#{id}" }
+      else
+        raise 'invalid parameters'
+      end
+    when /^create$/
+      #mkitc create service.yaml => POST services service.yaml
+      case args.size
+      when 2
+        file = args[1]
+        request = { verb: :post, uri: "/services", file: file }
+      else
+        raise 'invalid parameters'
+      end
+    when /^update$/
+      #mkitc update service.yaml => PUT services/{id} service.yaml
+      case args.size
+      when 2
+        file = args[1]
+        yaml = YAML.load_file(file)
+        if yaml["service"].nil?
+          raise 'invalid configuration file'
+        else
+          id = yaml["service"]["name"]
+          request = { verb: :put, uri: "/services/#{id}", file: file }
+        end
+      else
+        raise 'invalid parameters'
+      end
+    else
+      raise "Usage: invalid parameters"
     end
+    request
+  end
+
+  def doIt(args)
+    operation = parse_args(args)
+    puts request(operation).body
+  end
+
+  def request(request)
+    req = nil
+    uri = request[:uri]
+    unless request[:params].nil? || request[:params].empty?
+      uri = uri + '?' + request[:params].map{|k,v| "#{k}=#{v}"}.join('&')
+    end
+    case request[:verb]
+    when :post
+      req = Net::HTTP::Post.new(uri)
+      unless request[:file].nil?
+        (body, boundary) = attach(request[:file])
+        req.body = body
+        req["Content-Type"] = "multipart/form-data, boundary=#{boundary}"
+      end
+    when :put
+      req = Net::HTTP::Put.new(uri)
+      unless request[:file].nil?
+        (body, boundary) = attach(request[:file])
+        req.body = body
+        req["Content-Type"] = "multipart/form-data, boundary=#{boundary}"
+      end
+    when :patch
+      req = Net::HTTP::Patch.new(uri)
+    when :get
+      req = Net::HTTP::Get.new(uri)
+    when :delete
+      req = Net::HTTP::Delete.new(uri)
+    end
+    @client.request(req)
+  end
 
-    response = %x{curl -sL -X #{ARGV[0]} http://localhost:4567/#{ARGV[1]} #{ARGV[2]} #{ARGV[3]} #{ARGV[4]} #{ARGV[5]} #{ARGV[6]} #{ARGV[7]}}
-    puts response
+  def attach(file)
+    boundary=SecureRandom.alphanumeric
+    body = []
+    body << "--#{boundary}\r\n"
+    body << "Content-Disposition: form-data; name=file; filename='#{File.basename(file)}'\r\n"
+    body << "Content-Type: text/plain\r\n"
+    body << "\r\n"
+    body << File.read(file)
+    body << "\r\n--#{boundary}--\r\n"
+    [ body.join, boundary]
   end
 end
 
+#
+# go
+#
 client = MKItClient.new
-client.run
+client.doIt(ARGV.dup)
+#
+# if ARGV.any?
+# parse args
+#  host, socket, config file
+# end
 

data/lib/mkit/app/helpers/docker_helper.rb

@@ -38,9 +38,9 @@ module MKIt
       MKIt::CmdRunner.run("docker network create #{network_name}")
     end
 
-    def inspect_network(network_name)
-      x = MKIt::CmdRunner.run("docker network inspect #{network_name}")
-      JSON.parse(x).first
+    def network_exists?(network_name)
+      x = MKIt::CmdRunner.run("docker network ls")
+      x.match(/\b#{network_name}\b/)
     end
 
     def dettach_network(network_id, instance_id)

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

@@ -16,21 +16,20 @@ class Pool < ActiveRecord::Base
     ips = range.split('-')
     next_ip = ips[0]
     next_ip = next_ip.to_i
-    lease.select(:status == MKIt::PoolStatus::IN_USE || :status == MKIt::PoolStatus::RESERVED).each { |l|
-      leased_ip = l.ip.split('.')[3]
-      leased_ip = leased_ip.to_i
-      if leased_ip >= next_ip
-        next_ip = leased_ip+1
+    ip_add = self.ip.split('.')
+    while next_ip <= ips[1].to_i + 1 do
+      if (lease.select{|l| l.ip == "#{ip_add[0]}.#{ip_add[1]}.#{ip_add[2]}.#{next_ip}"}.size == 0)
+        break
+      else
+        next_ip+=1
       end
-    }
+    end
+
     if next_ip > ips[1].to_i
       self.status = MKIt::PoolStatus::EXAUSTED
       self.save
       raise PoolExaustedException.new
     end
-
-    ip_add = self.ip.split('.')
-
     "#{ip_add[0]}.#{ip_add[1]}.#{ip_add[2]}.#{next_ip}"
   end
 

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

@@ -46,13 +46,6 @@ class Service < ActiveRecord::Base
       status: MKIt::Status::CREATING
     )
 
-    # docker network
-    if config.network.nil? || config.network.empty?
-      srv.pods_network="mkit"
-    else
-      srv.pods_network=config.network
-    end
-
     # reserve pool ip
     srv.lease = Pool.find_by_name(MKIt::Utils.me).reserve_for(srv)
 
@@ -91,6 +84,14 @@ class Service < ActiveRecord::Base
     end
     self.max_replicas = self.min_replicas if self.min_replicas > self.max_replicas
 
+    # docker network
+    if config.network.nil? || config.network.empty?
+      self.pods_network="mkit"
+    else
+      self.pods_network=config.network
+    end
+    self.create_pods_network
+
     # haproxy ports
     self.service_port = []
     config.ports&.each do |p|
@@ -130,16 +131,13 @@ class Service < ActiveRecord::Base
   end
 
   def create_pods_network
-    netw = inspect_network(self.pods_network)
-    create_network(self.pods_network) if netw.nil?
+    create_network(self.pods_network) if !network_exists?(self.pods_network)
   end
 
   def deploy_network
     # create service interface...
     self.lease.confirm
     self.lease.up
-    # ...and pods network
-    self.create_pods_network
   end
 
   def add_volume(volume_config)

data/lib/mkit/version.rb

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

data/samples/apps/rabbitmq.yml

@@ -2,7 +2,7 @@
 service:
   name: rabbitmq
   image: rabbitmq:3-management-alpine
-  network: bridge # docker network
+  network: rabbitmq # 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.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Vasco Santos
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-08 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ping
@@ -371,7 +371,7 @@ homepage: http://vars.pt
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -386,8 +386,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: micro kubernets
 test_files: []