mkit 0.10.3 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87ebdfac894683e95586a4631c94dd82b3ae5dadc94d6e6fb218977a54bd8952
-  data.tar.gz: 022f8de5a56588ac6e7cc590d421de1810b2240c4a6938010bf0ed846de524f4
+  metadata.gz: 0fc21ab718559c64d16f2dd68a7778fb496530325d18bdcf91d99305ff54c1c5
+  data.tar.gz: e8805a10f7bf5a79418a4752031951c336c6191d2b5ff08068ec48d658a74916
 SHA512:
-  metadata.gz: 7dd2eb993061589bd7fc87360e97e44640cdb411f0b0b6933799cb20a753db146100e46f96cba0fa86d7c5dfb412795016896174b3e360e6adcf64be29cd959a
-  data.tar.gz: '01982702618f9a282def8d33cb8d08e02d07e08bfe4190ecfa982418545f40f9374b2d24785fd408eae232ebb4087c4f8e563154bd4c63ff7c50542137b0d728'
+  metadata.gz: 0a43e99260fe7082c992f360de46d1d09ef28ed53bd0dd4064abd63666503fce3555ff9f41a1f8e9d84cc66c6f7f57d0f3be92ba8db22e7e1c16dbc051e524a2
+  data.tar.gz: 3456970eadebec1cef12ac64a6caede473b0f5570736b0d3ce5228e50513c81837b9bdb7f3ded8ae35c1dac036914dbc83b49b89d0ff992c0978af6188e00b5d

data/README.md

@@ -176,6 +176,10 @@ service:
   resources:
     min_replicas: 1 # default value. Pods will be available on internal DNS as '<service_name>.internal'
     max_replicas: 1 # default value
+    limits:
+      cpu: 250m # cpu limit - 1000m represents 1 cpu core. minimum 10m. default is empty
+      memory: 250m # memory limit - default is empty
+      memory_swap: 250m # memory + swap limit - default is empty
   volumes:
     - 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

data/db/migrate/008_create_resources.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class CreateResources < ActiveRecord::Migration[5.1]
+  def up
+    create_table :resources do |t|
+      t.string :service_id
+      t.string :version
+      t.integer :min_replicas, default: 1
+      t.integer :max_replicas, default: 1
+      t.string :cpu_limits
+      t.string :memory_limits
+      t.string :memory_swap_limits
+      t.timestamp :created_at
+      t.timestamp :updated_at
+    end
+  end
+end

data/db/migrate/009_migrate_resources.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class MigrateResources < ActiveRecord::Migration[5.1]
+
+  #
+  # migrate the resource data from service
+  #
+  def up
+    Service.all.each do |service|
+      resource = Resource.new
+      resource.max_replicas = service.max_replicas
+      resource.min_replicas = service.min_replicas
+      service.resource = resource
+    end
+  end
+end

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

@@ -30,7 +30,7 @@ class ServicesController < MKIt::Server
   get '/services/:id' do
     srv = find_by_id_or_name
     resp = if params[:format] == 'yaml'
-             srv.to_h({details: params[:details] == 'true'}).to_yaml
+             srv.to_h({details: params[:details] == 'true'}).to_yaml(line_width: -1)
            elsif params[:format] == 'json'
              JSON.pretty_generate(srv.to_h({details: params[:details] == 'true'}))
            else
@@ -107,7 +107,7 @@ class ServicesController < MKIt::Server
     if params[:file]
       tempfile = params[:file][:tempfile]
       yaml = YAML.safe_load(tempfile.read)
-      srv = migrate_service(yaml).to_yaml
+      srv = migrate_service(yaml).to_yaml(line_width: -1)
     end
     srv
   end

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

@@ -87,5 +87,20 @@ module MKIt
       x = MKIt::CmdRunner.run("docker volume inspect #{volume_name}")
       JSON.parse(x).first
     end
+
+    ##
+    # cpu limits
+    def to_docker_cpu_limit(k8s_cpu_limits)
+      if k8s_cpu_limits.nil?
+        nil
+      else
+        cpu_limit = k8s_cpu_limits.to_s
+        if cpu_limit.include?('m')
+          cpu_limit = cpu_limit.delete_suffix('m')
+          cpu_limit = (cpu_limit.to_f / 1000).to_s
+        end
+        cpu_limit
+      end
+    end
   end
 end

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+class Resource < ActiveRecord::Base
+  belongs_to :service
+
+  def self.create(yaml)
+    resource = Resource.new
+    if yaml.nil?
+      resource.max_replicas = 1
+      resource.min_replicas = 1
+    else
+      validate(yaml)
+      if yaml["min_replicas"]
+        resource.min_replicas = yaml["min_replicas"]
+      else
+        resource.min_replicas = 1
+      end
+      if yaml["max_replicas"]
+        resource.max_replicas = yaml["max_replicas"]
+      else
+        resource.max_replicas = resource.min_replicas
+      end
+      resource.cpu_limits = yaml["limits"]["cpu"] if yaml["limits"] && yaml["limits"]["cpu"]
+      resource.memory_limits = yaml["limits"]["memory"] if yaml["limits"] && yaml["limits"]["memory"]
+      resource.memory_swap_limits = yaml["limits"]["memory_swap"] if yaml["limits"] && yaml["limits"]["memory_swap"]
+    end
+    resource
+  end
+
+  def self.validate(yaml)
+    unless yaml.nil?
+      raise_bad_configuration "resource min_replicas must be bigger or equal than 1" if yaml["min_replicas"] && yaml["min_replicas"] < 1
+      raise_bad_configuration "resource max_replicas must be bigger or equal than 1" if yaml["max_replicas"] && yaml["max_replicas"] < 1
+      if yaml["min_replicas"] && yaml["max_replicas"]
+        raise_bad_configuration "resource max_replicas must be bigger or equal than min_replicas" if yaml["min_replicas"] > yaml["max_replicas"]
+      end
+    end
+    # validate limits
+    unless yaml.nil? || yaml["limits"].nil?
+      resources = yaml["limits"]
+      raise_bad_configuration "resource cpu limits must match '\\d+m'" if resources["cpu"] && resources["cpu"] !~ /\d+m$/
+      raise_bad_configuration "resource memory limits must match '\\d+m'" if resources["memory"] && resources["memory"] !~ /\d+m$/
+      raise_bad_configuration "resource memory_swap limits must match '\\d+m'" if resources["memory_swap"] && resources["memory_swap"] !~ /\d+m$/
+    end
+    true
+  end
+
+  def to_h(options = {})
+    hash = {
+      min_replicas: self.min_replicas,
+      max_replicas: self.max_replicas
+    }
+    if self.cpu_limits || self.memory_limits || self.memory_swap_limits
+      hash[:limits] = {}
+      hash[:limits][:cpu] = self.cpu_limits if self.cpu_limits
+      hash[:limits][:memory] = self.memory_limits if self.memory_limits
+      hash[:limits][:memory_swap] = self.memory_swap_limits if self.memory_swap_limits
+    end
+    hash.remove_symbols_from_keys
+  end
+end

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

@@ -1,5 +1,6 @@
 require 'mkit/app/model/volume'
 require 'mkit/app/model/ingress'
+require 'mkit/app/model/resource'
 require 'mkit/app/model/service_port'
 require 'mkit/app/model/service_config'
 require 'mkit/app/model/pod'
@@ -23,6 +24,7 @@ class Service < ActiveRecord::Base
   has_one  :lease, dependent: :destroy
   has_one  :dns_host, dependent: :destroy
   has_one  :ingress, dependent: :destroy
+  has_one  :resource, dependent: :destroy
 
   before_destroy :clean_up
 
@@ -64,7 +66,7 @@ class Service < ActiveRecord::Base
       srv.save!
       data = { service_id: srv.id, version: srv.version }
       # create pod
-      (1..srv.min_replicas).each { |i|
+      (1..srv.resource.min_replicas).each { |i|
         pd = Pod.new( status: MKIt::Status::CREATED, name: SecureRandom.uuid.gsub('-','')[0..11])
         srv.pod << pd
         MkitJob.publish(topic: :create_pod_saga, data: {pod_name: pd.name})
@@ -77,14 +79,7 @@ class Service < ActiveRecord::Base
     self.image = config.image if config.image != self.image
     self.command = config.command if config.command != self.command
 
-    unless config.resources.nil?
-      self.max_replicas = config.resources.max_replicas unless config.resources.max_replicas.nil? || config.resources.max_replicas < 1
-      self.min_replicas = config.resources.min_replicas unless config.resources.min_replicas.nil? || config.resources.min_replicas < 1
-    else
-      self.min_replicas = 1
-      self.max_replicas = 1
-    end
-    self.max_replicas = self.min_replicas if self.min_replicas > self.max_replicas
+    self.resource = Resource.create(config.resources)
 
     # docker network
     if config.network.nil? || config.network.empty?
@@ -122,8 +117,7 @@ class Service < ActiveRecord::Base
       # destroy old pods...
       self.pod.destroy_all
       # create pod
-      data = { service_id: self.id, version: self.version }
-      (1..self.min_replicas).each { |i|
+      (1..self.resource.min_replicas).each { |i|
         pd = Pod.new( status: MKIt::Status::CREATED, name: SecureRandom.uuid.gsub('-','')[0..11])
         self.pod << pd
         MkitJob.publish(topic: :create_pod_saga, data: {pod_name: pd.name})
@@ -276,12 +270,9 @@ class Service < ActiveRecord::Base
       }
     end
 
-    # ingress
     srv['ingress'] = self.ingress.to_h(options)
+    srv['resources'] = self.resource.to_h
 
-    srv['resources'] = {}
-    srv['resources']['min_replicas'] = self.min_replicas
-    srv['resources']['max_replicas'] = self.max_replicas
     srv['volumes'] = []
     self.volume.each { |v|
       if v.ctype ==  MKIt::CType::DOCKER_STORAGE.to_s

data/lib/mkit/app/templates/docker/docker_run.sh.erb

@@ -1 +1,10 @@
-docker run -d --name <%=name%>  <%service.service_config&.select{ |x| x.ctype == MKIt::CType::ENVIRONMENT.to_s }.each { |env|%><%=" -e #{env.key}=\"#{env.value}\""%><%}%> <%service.volume&.each { |vol|%><%=" -v \"#{vol.name}:#{vol.path}\""%><%}%>  --network <%=service.pods_network%> --dns <%=service.my_dns%> <%=service.image%> <%=service.command unless service.command.nil?%>
+docker run -d --name <%=name%>  \
+  <%service.service_config&.select{ |x| x.ctype == MKIt::CType::ENVIRONMENT.to_s }.each { |env|%><%=" -e #{env.key}=\"#{env.value}\""%><%}%> \
+  <%service.volume&.each { |vol|%><%=" -v \"#{vol.name}:#{vol.path}\""%><%}%> \
+  --network <%=service.pods_network%> \
+  --dns <%=service.my_dns%> \
+  <%="--cpus #{to_docker_cpu_limit(service.resource.cpu_limits)}" unless service.resource.cpu_limits.nil?%> \
+  <%="--memory #{service.resource.memory_limits}" unless service.resource.memory_limits.nil?%> \
+  <%="--memory-swap #{service.resource.memory_swap_limits}" unless service.resource.memory_swap_limits.nil?%> \
+  <%=service.image%> \
+  <%=service.command unless service.command.nil?%>

data/lib/mkit/cmd_runner.rb

@@ -19,7 +19,7 @@ module MKIt
       rescue PTY::ChildExited
         # nothing
       end
-      raise CmdRunnerException.new("command '#{cmd[0..30]}...' returned an error response") if !$?.nil? && $?.exitstatus != 0
+      raise CmdRunnerException.new("command '#{cmd[0..30]}...' returned an error [#{result}] (#{$?})") if !$?.nil? && $?.exitstatus != 0
       result
     end
   end

data/lib/mkit/version.rb

@@ -1,4 +1,4 @@
 module MKIt
-  VERSION = "0.10.3"
+  VERSION = "0.10.5"
 end
 

data/lib/mkit.rb

@@ -138,13 +138,26 @@ module MKIt
     MKItLogger.info 'restoring operations...'
     # create interfaces of deployed apps  otherwise haproxy won't start
     Service.all.each do |srv|
-      srv.deploy_network
-      srv.update_status!
+      begin
+        srv.deploy_network
+        srv.update_status!
+      rescue => e
+        MKItLogger.warn "Error restoring service #{srv.name}: #{e.message}"
+      end
     end
     # daemontools would eventually start haproxy; systemd does not.
     # so, restart here.
-    MKItLogger.debug 'restarting proxy...'
-    MKIt::HAProxy.restart
+    Thread.new do
+      begin
+        MKItLogger.debug 'restarting proxy...'
+        MKIt::HAProxy.stop
+        sleep 10
+        MKIt::HAProxy.restart
+        MKItLogger.debug 'restarting proxy done.'
+      rescue => e
+        MKItLogger.error "Error in restart_proxy thread: #{e.message}"
+      end
+    end
   end
 
   def self.startup(options: {})

data/samples/apps/httpbin.yml

@@ -40,6 +40,10 @@ service:
   resources:
     min_replicas: 1
     max_replicas: 1
+    limits:
+      cpu: 250m
+      memory: 250m
+      memory_swap: 250m
   volumes: []
   environment:
     LOG4J_LEVEL: WARN

data/samples/apps/swiss-army-knife.yml

@@ -0,0 +1,38 @@
+---
+service:
+  name: swiss-army-knife
+  image: leodotcloud/swiss-army-knife
+  command: swiss-army-knife
+  network: bridge
+  ingress:
+    frontend:
+      - name: http-in
+        options:
+          - option httpclose
+          - option forwardfor
+        bind:
+          port: 80
+          mode: http
+        default_backend: server
+    backend:
+    - name: server
+      balance: round_robin
+      options:
+      - cookie JSESSIONID prefix
+      bind:
+        port: 8080
+        mode: http
+        options:
+        - cookie A
+        - check
+  resources:
+    min_replicas: 1
+    max_replicas: 1
+    limits:
+      cpu: 500m
+      memory: 512m
+      memory_swap: 512m
+  volumes: []
+  environment:
+    LOG4J_LEVEL: WARN
+    LOGGING_LEVEL_ROOT: WARN

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mkit
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.5
 platform: ruby
 authors:
 - Vasco Santos
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-09 00:00:00.000000000 Z
+date: 2025-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-dns
@@ -393,6 +393,8 @@ files:
 - db/migrate/005_create_frontend.rb
 - db/migrate/006_create_backend.rb
 - db/migrate/007_migrate_schema.rb
+- db/migrate/008_create_resources.rb
+- db/migrate/009_migrate_resources.rb
 - db/schema.rb
 - lib/mkit.rb
 - lib/mkit/app/controllers/mkit_controller.rb
@@ -416,6 +418,7 @@ files:
 - lib/mkit/app/model/mkit_job.rb
 - lib/mkit/app/model/pod.rb
 - lib/mkit/app/model/pool.rb
+- lib/mkit/app/model/resource.rb
 - lib/mkit/app/model/service.rb
 - lib/mkit/app/model/service_config.rb
 - lib/mkit/app/model/service_port.rb
@@ -476,6 +479,7 @@ files:
 - samples/apps/rabbitmq.yml
 - samples/apps/redis-sentinel.yml
 - samples/apps/redis.yml
+- samples/apps/swiss-army-knife.yml
 - samples/daemontools/log/run
 - samples/daemontools/run
 - samples/systemd/mkitd.service