mkit 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dab845891b079ffbf0f696676c1c3b6e25e583c02a09570582571976f8ce40d
-  data.tar.gz: 59e3174e0e09347c2e40a7f7096cfd3c9f9575a588d210c0d7dd71ccfcadf206
+  metadata.gz: 5ce73321371e8f675a5c28106e9287762ed5cf8b39ecfc8c97b35f62806a45c1
+  data.tar.gz: 21189b10e952913a03d50498201869010fef447f4b621a5f3e2f39a1ab12c94c
 SHA512:
-  metadata.gz: a447023289277ea09120233ec72cb3b5a2de96077ee012b30fd369e21c338b487a898217d367dba7b8a86499a940944dee60ecdecbced737c00b70358e3141f4
-  data.tar.gz: b33b3276ad887b3939d2898b2d09c0a8a807a62856b761969f50e675c2e01fcd2f48abc1a49259dea60e4d12df563b0b73d4d4852880bb0e4abf2e539714074f
+  metadata.gz: e38e72898702d11bf928534444a63fe1744b3af47494c4da7789ece5c01cb611b824e716cc7cc39454c738d730da5533393aefea8801da236ecce97d9b291f3e
+  data.tar.gz: 2e2d930ef466b48fbb75b07dbf12586cb41e0324a043eed2f334b9d4a638ba9369f6d65f85ca6c24d4573d8076dacfb26d43bc166de465212df8dbda3ee4edae

data/README.md

@@ -7,7 +7,7 @@ It's also a frontend for `docker`, providing an easier way for your services to
 It contains an internal DNS and uses HAProxy as ingress for Pod access.
 The database is a simple sqlite3 db and the server is a Sinatra based application.
 
-A client is also included to access the API, e.g. `mkitc ps`.
+A client is also included to access the API, e.g. `mkit ps`.
 
 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. 
 
@@ -102,22 +102,22 @@ mkit:
 
 ### Client configuration
 
-On `mkitc` first call, default configuration will be copied to `$HOME/.mkit` with `local`default profile set.
+On `mkit` first call, default configuration will be copied to `$HOME/.mkit` with `local`default profile set.
 
-You must call `mkitc init` to initialize client configuration.
+You must call `mkit init` to initialize client configuration.
 
 Client identification key (`my_id`) will be generated, printed out to console and saved to the client's configuration file.
 
-You may edit the local configuration file to add more servers and change active profile with `$mkitc profile set <profile_name>`, e.g. `$mkitc profile set server_2`
+You may edit the local configuration file to add more servers and change active profile with `$mkit profile set <profile_name>`, e.g. `$mkit profile set server_2`
 
 ```
 # ~/.mkit/mkitc_config.yml
 mkit:
   local: 
     server.uri: https://localhost:4567
-  server_2:  # you can add more servers. change the client active profile with mkitc profile command
+  server_2:  # you can add more servers. change the client active profile with mkit profile command
     server.uri: https://192.168.29.232:4567
-my_id: unique_id # this id is generated running mkitc init
+my_id: unique_id # this id is generated running mkit init
 ```
 
 ### Service
@@ -174,10 +174,10 @@ There's also samples for [systemd](samples/systemd) and [daemontools](samples/da
 
 A client is provided to interact with MKIt server.
 
-Run `mkitc help` for a list of current supported commands.
+Run `mkit help` for a list of current supported commands.
 
 ```
-Usage: mkitc <command> [options]
+Usage: mkit <command> [options]
 
 Micro k8s on Ruby - a simple tool to mimic a (very) minimalistic k8 cluster
 
@@ -197,13 +197,13 @@ version    prints mkit server version
 proxy      haproxy status and control
 profile    mkit client configuration profile
 
-Run 'mkitc help <command>' for specific command information.
+Run 'mkit help <command>' for specific command information.
 ```
 
 Example:
 
 ```
-$ mkitc ps
+$ mkit ps
 +----+-------+---------------+-------------------+--------------+---------+
 | id | name  |     addr      |       ports       |     pods     | status  |
 +----+-------+---------------+-------------------+--------------+---------+
@@ -214,7 +214,7 @@ $ mkitc ps
 The service `mongo` is available on IP `10.210.198.10:27017`
 The service `nexus` is available on IP `10.210.198.11:80` and on port `443` with ssl.
 
-**Note:** Don't forget to call `mkitc init` to initialize client configuration and to add the `client-id`
+**Note:** Don't forget to call `mkit init` to initialize client configuration and to add the `client-id`
 to the server authorized clients list.
 
 ## Development
@@ -224,6 +224,13 @@ to the server authorized clients list.
 * console
   * `rake console`
 
+# Contributing
+ * Fork it
+ * Create your feature branch (git checkout -b my-new-feature)
+ * Commit your changes (git commit -am 'Add some feature')
+ * Push to the branch (git push origin my-new-feature)
+ * Create new Pull Request
+
 # Thanks
 
 For my kids. :) 

data/bin/{mkitc → mkit}

@@ -203,7 +203,7 @@ class MKItClient
 
     @configuration = cfg['mkit'][current_profile.lstrip]
     if !init_call && cfg['my_id'].nil?
-      raise InvalidParametersException.new("Please run 'mkitc init' to initialize mkit client.", find_command('init'))
+      raise InvalidParametersException.new("Please run ' mkit init' to initialize mkit client.", find_command('init'))
     end
     @my_id = cfg['my_id']
     cfg
@@ -360,16 +360,16 @@ class MKItClient
       my_cmd = cause.command
     end
     if my_cmd.nil?
-      msg += "\nUsage: mkitc <command> [options]\n\n"
+      msg += "\nUsage: mkit <command> [options]\n\n"
       msg += "Micro k8s on Ruby - a simple tool to mimic a (very) minimalistic k8 cluster\n\n"
       msg += "Commands:\n\n"
       dict.each do |c|
         msg += format("%-10s %s\n", c[:cmd], c[:help])
       end
       msg += "\n"
-      msg += "Run 'mkitc help <command>' for specific command information.\n\n"
+      msg += "Run ' mkit help <command>' for specific command information.\n\n"
     else
-      msg += format("\nUsage: mkitc %s %s\n\n", my_cmd[:cmd], my_cmd[:usage].nil? ? '' : my_cmd[:usage].join(' '))
+      msg += format("\nUsage: mkit %s %s\n\n", my_cmd[:cmd], my_cmd[:usage].nil? ? '' : my_cmd[:usage].join(' '))
       msg += format("%s\n", my_cmd[:help])
       unless my_cmd[:options].nil?
         msg += "\nOptions:\n"

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

@@ -16,10 +16,9 @@ class Pod < ActiveRecord::Base
     new_ip = nil
     tries = 5
     while (new_ip.nil? && tries > 0) do
-        instance = self.properties.to_o
-        new_ip = instance.NetworkSettings.Networks[self.service.pods_network].IPAddress
-        sleep(1) if new_ip.nil?
-        tries = tries - 1
+      new_ip = self.instance.NetworkSettings.Networks[self.service.pods_network].IPAddress
+      sleep(1) if new_ip.nil?
+      tries = tries - 1
     end
     if self.ip != new_ip
       self.ip = new_ip
@@ -40,14 +39,8 @@ class Pod < ActiveRecord::Base
     self.dns_host.save
   end
 
-  def properties
-    inspect_instance(self.name)
-  end
-
   def set_status_from_docker
-    instance = self.properties
-    if self.properties
-      instance = instance.to_o
+    if self.instance
       if instance.State.Running
         self.status = MKIt::Status::RUNNING
       else
@@ -65,30 +58,31 @@ class Pod < ActiveRecord::Base
   end
 
   def start
-    if self.pod_id.nil?
+    if self.instance.nil?
       docker_run = parse
       MKItLogger.info("deploying docker pod, cmd [#{docker_run}]")
       create_instance(docker_run)
     else
-      pre_check
-
-      instance = self.properties.to_o
       start_instance(self.name) unless instance.State.Running
     end
   end
 
   def stop
-    pre_check
-    stop_instance(self.name)
+    stop_instance(self.name) unless self.instance.nil? || !self.instance.State.Running
   end
 
-  def pre_check
-    raise MKIt::PodNotFoundException.new('no pod_name found') if self.name.nil?
-    raise MKIt::PodNotFoundException.new("no properties found for #{self.name}") if self.properties.nil?
+  def instance
+    properties = inspect_instance(self.name)
+    return properties.to_o unless properties.nil?
+    nil
   end
 
   def clean_up
-    remove_instance(self.name) unless self.pod_id.nil?
+    begin
+      remove_instance(self.name) unless self.instance.nil?
+    rescue => e
+      MKItLogger.warn(e)
+    end
     MkitJob.publish(topic: :pod_destroyed, service_id: self.service.id, data: {pod_id: self.id})
   end
 end

data/lib/mkit/docker_listener.rb

@@ -5,16 +5,32 @@ require 'mkit/status'
 # https://docs.docker.com/engine/reference/commandline/events
 require 'mkit/app/helpers/docker_helper'
 module MKIt
+class StopThread < RuntimeError; end
+
   class DockerListener
     include MKIt::DockerHelper
 
     def initialize
-      @consumers = []
+      @queue = Queue.new
+    end
+
+    def enqueue(msg)
+      @queue << msg
+    end
+
+    def start
+      @consumer.run if register_consumer
+      @listener.run if register_listener
     end
 
-    def register_consumer(consumer:)
+    def stop
+      @listener.exit if @listener
+      @consumer.raise StopThread.new
+      MKItLogger.info("docker listener stopped")
     end
 
+    private
+
     def parse_message(msg)
       action = msg['Action'].to_sym
       type = msg['Type'].to_sym
@@ -36,24 +52,26 @@ module MKIt
             pod.save
             pod.service.update_status!
           when :kill
-            MKItLogger.debug("	#{type} #{action} <<NOOP / TODO>>")
+            pod.service.update_status!
           when :die
-            MKItLogger.debug("	#{type} #{action} <<NOOP / TODO>>")
+            pod.service.update_status!
           when :stop
             pod.service.update_status!
           else
             MKItLogger.debug("	#{type} #{action} <<TODO>>")
           end
         else
-          MKItLogger.warn("docker <<#{type}>> <#{action}> received: #{msg}. But I don't know anything about pod #{pod_id}")
+          MKItLogger.warn("docker <<#{type}>> <#{action}> received: #{msg}. But I don't know anything about pod #{pod_id}/#{pod_name}")
         end
       when :network
         pod_id = msg.Actor.Attributes.container
-        pod = Pod.find_by(pod_id: pod_id)
+        inspect = inspect_instance(pod_id).to_o
+        pod_name = inspect.Name[1..]
+        pod = Pod.find_by(name: pod_name)
         unless pod.nil?
           case action
           when :connect
-            MKItLogger.info("docker network #{action} received: #{msg}")
+            MKItLogger.info("docker network #{action} received: #{msg} for pod #{pod_name}")
             pod.update_ip
             pod.save
           when :disconnect
@@ -62,20 +80,41 @@ module MKIt
             MKItLogger.debug("  #{type} #{action} <<TODO>>")
           end
         else
-          MKItLogger.warn("docker <<#{type}>> <#{action}> received: #{msg}. But I don't know anything about pod #{pod_id}")
+          MKItLogger.warn("docker <<#{type}>> <#{action}> received: #{msg}. But I don't know anything about pod #{pod_id}/#{pod_name}")
         end
       else
         MKItLogger.info("\t#{type} #{action} <<unknown>>")
       end
     end
 
-    def start
-      @thread ||= Thread.new {
+    def register_consumer
+      return false unless @consumer.nil?
+
+      @consumer = Thread.new do
+        running = true
+        while running
+          begin
+            parse_message(@queue.pop)
+          rescue StopThread
+            running = false
+            MKItLogger.info("docker consumer ended")
+          rescue => e
+            MKItLogger.error("error while consuming docker notification: #{e}", e.message, e.backtrace.join("\n"))
+          end
+        end
+      end
+      true
+    end
+
+    def register_listener
+      return false unless @listener.nil?
+
+      @listener = Thread.new {
         cmd = "docker events --format '{{json .}}'"
         begin
           PTY.spawn( cmd ) do |stdout, stdin, pid|
             begin
-              stdout.each { |line| parse_message JSON.parse(line).to_o }
+              stdout.each { |line| enqueue JSON.parse(line).to_o }
             rescue Errno::EIO
               MKItLogger.warn("Errno:EIO error, but this probably just means " +
                 "that the process has finished giving output")
@@ -85,12 +124,8 @@ module MKIt
           MKItLogger.warn("docker event listener process exited!")
         end
       }
-      @thread.run
       MKItLogger.info("docker listener started")
-    end
-    def stop
-      @thread.exit if @thread
-      MKItLogger.info("docker listener stopped")
+      true
     end
   end
 end

data/lib/mkit/version.rb

@@ -1,4 +1,4 @@
 module MKIt
-  VERSION = "0.6.1"
+  VERSION = "0.6.3"
 end
 

data/mkit

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path('lib')
+#
+ENV['SINATRA_ENV'] ||= "development"
+ENV['RACK_ENV'] ||= "development"
+
+load 'bin/mkit'
+

data/mkit.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|TODO|db/development.sqlite)}) }
   end
   s.executables  << 'mkitd'
-  s.executables  << 'mkitc'
+  s.executables  << 'mkit'
   s.add_runtime_dependency 'async-dns', '~> 1.3', '>= 1.3.0'
   s.add_runtime_dependency 'dry-container', '~> 0.9', '>= 0.9.0'
   s.add_runtime_dependency 'net_http_unix',   '~> 0.2', '>= 0.2.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mkit
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - Vasco Santos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-27 00:00:00.000000000 Z
+date: 2024-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-dns
@@ -316,7 +316,7 @@ email:
 - valexsantos@gmail.com
 executables:
 - mkitd
-- mkitc
+- mkit
 extensions: []
 extra_rdoc_files: []
 files:
@@ -327,7 +327,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/mkitc
+- bin/mkit
 - bin/mkitd
 - config/database.yml
 - config/mkit_config.yml
@@ -386,6 +386,7 @@ files:
 - lib/mkit/workers/pod_worker.rb
 - lib/mkit/workers/service_worker.rb
 - lib/mkit/workers/worker_manager.rb
+- mkit
 - mkit.gemspec
 - mkitd
 - samples/apps/kafka-cluster.yml