mkit 0.10.6 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Makefile +42 -0
- data/README.md +4 -1
- data/config/mkit_config.yml +3 -0
- data/docs/architecture.md +102 -0
- data/lib/mkit/app/controllers/pods_controller.rb +2 -2
- data/lib/mkit/app/controllers/services_controller.rb +4 -4
- data/lib/mkit/app/model/ingress.rb +1 -1
- data/lib/mkit/app/model/mkit_job.rb +0 -1
- data/lib/mkit/app/model/pod.rb +51 -36
- data/lib/mkit/app/model/resource.rb +7 -4
- data/lib/mkit/app/model/service.rb +51 -23
- data/lib/mkit/app/model/volume.rb +3 -3
- data/lib/mkit/app/templates/haproxy/app_haproxy.cfg.erb +1 -1
- data/lib/mkit/container/abstract.rb +16 -0
- data/lib/mkit/container/api.rb +22 -0
- data/lib/mkit/container/containers.rb +22 -0
- data/lib/mkit/container/docker/api.rb +25 -0
- data/lib/mkit/container/docker/containers.rb +178 -0
- data/lib/mkit/container/docker/events.rb +22 -0
- data/lib/mkit/container/docker/mapper.rb +54 -0
- data/lib/mkit/container/docker/networks.rb +37 -0
- data/lib/mkit/container/docker/payload.rb +41 -0
- data/lib/mkit/container/docker/stream_demux.rb +51 -0
- data/lib/mkit/container/docker/volumes.rb +29 -0
- data/lib/mkit/container/errors.rb +21 -0
- data/lib/mkit/container/event.rb +29 -0
- data/lib/mkit/container/events.rb +15 -0
- data/lib/mkit/container/http/unix_client.rb +139 -0
- data/lib/mkit/container/info.rb +41 -0
- data/lib/mkit/container/networks.rb +19 -0
- data/lib/mkit/container/registry.rb +37 -0
- data/lib/mkit/container/spec.rb +67 -0
- data/lib/mkit/container/utf8_buffer.rb +62 -0
- data/lib/mkit/container/volumes.rb +15 -0
- data/lib/mkit/ctypes.rb +0 -1
- data/lib/mkit/exceptions.rb +0 -2
- data/lib/mkit/pods/container_exec_command.rb +50 -0
- data/lib/mkit/pods/container_listener.rb +187 -0
- data/lib/mkit/pods/container_log_listener.rb +68 -0
- data/lib/mkit/pods/pod_reconciler.rb +48 -0
- data/lib/mkit/sagas/create_pod_saga.rb +22 -5
- data/lib/mkit/sagas/destroy_pod_saga.rb +6 -3
- data/lib/mkit/version.rb +1 -1
- data/lib/mkit/workers/haproxy_worker.rb +16 -10
- data/lib/mkit.rb +6 -4
- data/mkit.gemspec +2 -0
- metadata +59 -14
- data/lib/mkit/app/helpers/docker_helper.rb +0 -106
- data/lib/mkit/app/templates/docker/docker_run.sh.erb +0 -10
- data/lib/mkit/cmd/shell_client.rb +0 -57
- data/lib/mkit/cmd_runner.rb +0 -27
- data/lib/mkit/pods/docker_exec_command.rb +0 -38
- data/lib/mkit/pods/docker_listener.rb +0 -123
- data/lib/mkit/pods/docker_log_listener.rb +0 -40
data/lib/mkit.rb
CHANGED
|
@@ -16,7 +16,8 @@ require 'mkit/config/load_default_configs'
|
|
|
16
16
|
require_relative 'mkit/version'
|
|
17
17
|
require_relative 'mkit/mkit_interface'
|
|
18
18
|
require_relative 'mkit/mkit_dns'
|
|
19
|
-
|
|
19
|
+
require 'mkit/container/registry'
|
|
20
|
+
require_relative 'mkit/pods/container_listener'
|
|
20
21
|
require 'mkit/app/helpers/haproxy'
|
|
21
22
|
require 'mkit/app/controllers/services_controller'
|
|
22
23
|
require 'mkit/app/controllers/mkitjobs_controller'
|
|
@@ -78,6 +79,7 @@ module MKIt
|
|
|
78
79
|
|
|
79
80
|
# load configuration
|
|
80
81
|
MKIt::Initializers.load_my_configuration
|
|
82
|
+
MKIt::Container::Registry.configure_from(MKIt::Config.mkit)
|
|
81
83
|
# cert
|
|
82
84
|
MKIt::EasySSL.create_self_certificate(@config_dir)
|
|
83
85
|
#
|
|
@@ -177,8 +179,8 @@ module MKIt
|
|
|
177
179
|
dns.run
|
|
178
180
|
end
|
|
179
181
|
end
|
|
180
|
-
System.register(:
|
|
181
|
-
MKIt::
|
|
182
|
+
System.register(:container_listener, memoize: true) do
|
|
183
|
+
MKIt::ContainerListener.new
|
|
182
184
|
end
|
|
183
185
|
# watchdog feature is to be re-evaluated
|
|
184
186
|
# System.register(:watchdog, memoize: true) {
|
|
@@ -189,7 +191,7 @@ module MKIt
|
|
|
189
191
|
WorkerManager.register_workers
|
|
190
192
|
SagaManager.register_workers
|
|
191
193
|
System[:job_manager].start
|
|
192
|
-
System[:
|
|
194
|
+
System[:container_listener].start
|
|
193
195
|
# watchdog feature is to be re-evaluated
|
|
194
196
|
# System[:watchdog].start
|
|
195
197
|
System[:mkit_dns].run
|
data/mkit.gemspec
CHANGED
|
@@ -41,5 +41,7 @@ Gem::Specification.new do |s|
|
|
|
41
41
|
s.add_runtime_dependency 'text-table', '~> 1.2', '>= 1.2.4'
|
|
42
42
|
s.add_runtime_dependency 'faye-websocket', '= 0.11.3'
|
|
43
43
|
s.add_runtime_dependency 'json_schemer', '~> 2.5', '>= 2.5.0'
|
|
44
|
+
s.add_development_dependency 'minitest', '~> 5.20'
|
|
45
|
+
s.add_development_dependency 'mocha', '~> 3.0'
|
|
44
46
|
s.add_development_dependency 'rubocop', '~> 1.0'
|
|
45
47
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: mkit
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.
|
|
4
|
+
version: 0.11.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Vasco Santos
|
|
8
|
-
autorequire:
|
|
9
8
|
bindir: bin
|
|
10
9
|
cert_chain: []
|
|
11
|
-
date:
|
|
10
|
+
date: 1980-01-02 00:00:00.000000000 Z
|
|
12
11
|
dependencies:
|
|
13
12
|
- !ruby/object:Gem::Dependency
|
|
14
13
|
name: async
|
|
@@ -368,6 +367,34 @@ dependencies:
|
|
|
368
367
|
- - ">="
|
|
369
368
|
- !ruby/object:Gem::Version
|
|
370
369
|
version: 2.5.0
|
|
370
|
+
- !ruby/object:Gem::Dependency
|
|
371
|
+
name: minitest
|
|
372
|
+
requirement: !ruby/object:Gem::Requirement
|
|
373
|
+
requirements:
|
|
374
|
+
- - "~>"
|
|
375
|
+
- !ruby/object:Gem::Version
|
|
376
|
+
version: '5.20'
|
|
377
|
+
type: :development
|
|
378
|
+
prerelease: false
|
|
379
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
380
|
+
requirements:
|
|
381
|
+
- - "~>"
|
|
382
|
+
- !ruby/object:Gem::Version
|
|
383
|
+
version: '5.20'
|
|
384
|
+
- !ruby/object:Gem::Dependency
|
|
385
|
+
name: mocha
|
|
386
|
+
requirement: !ruby/object:Gem::Requirement
|
|
387
|
+
requirements:
|
|
388
|
+
- - "~>"
|
|
389
|
+
- !ruby/object:Gem::Version
|
|
390
|
+
version: '3.0'
|
|
391
|
+
type: :development
|
|
392
|
+
prerelease: false
|
|
393
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
394
|
+
requirements:
|
|
395
|
+
- - "~>"
|
|
396
|
+
- !ruby/object:Gem::Version
|
|
397
|
+
version: '3.0'
|
|
371
398
|
- !ruby/object:Gem::Dependency
|
|
372
399
|
name: rubocop
|
|
373
400
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -387,8 +414,8 @@ description: Micro k8s on Ruby - a simple tool to deploy containers to mimic a (
|
|
|
387
414
|
email:
|
|
388
415
|
- valexsantos - gmail - com
|
|
389
416
|
executables:
|
|
390
|
-
- mkitd
|
|
391
417
|
- mkit
|
|
418
|
+
- mkitd
|
|
392
419
|
extensions: []
|
|
393
420
|
extra_rdoc_files: []
|
|
394
421
|
files:
|
|
@@ -396,6 +423,7 @@ files:
|
|
|
396
423
|
- ".rubocop.yml"
|
|
397
424
|
- Gemfile
|
|
398
425
|
- LICENSE
|
|
426
|
+
- Makefile
|
|
399
427
|
- README.md
|
|
400
428
|
- Rakefile
|
|
401
429
|
- bin/mkit
|
|
@@ -414,12 +442,12 @@ files:
|
|
|
414
442
|
- db/migrate/008_create_resources.rb
|
|
415
443
|
- db/migrate/009_migrate_resources.rb
|
|
416
444
|
- db/schema.rb
|
|
445
|
+
- docs/architecture.md
|
|
417
446
|
- lib/mkit.rb
|
|
418
447
|
- lib/mkit/app/controllers/mkit_controller.rb
|
|
419
448
|
- lib/mkit/app/controllers/mkitjobs_controller.rb
|
|
420
449
|
- lib/mkit/app/controllers/pods_controller.rb
|
|
421
450
|
- lib/mkit/app/controllers/services_controller.rb
|
|
422
|
-
- lib/mkit/app/helpers/docker_helper.rb
|
|
423
451
|
- lib/mkit/app/helpers/erb_helper.rb
|
|
424
452
|
- lib/mkit/app/helpers/haproxy.rb
|
|
425
453
|
- lib/mkit/app/helpers/interface_helper.rb
|
|
@@ -442,7 +470,6 @@ files:
|
|
|
442
470
|
- lib/mkit/app/model/service_port.rb
|
|
443
471
|
- lib/mkit/app/model/setting.rb
|
|
444
472
|
- lib/mkit/app/model/volume.rb
|
|
445
|
-
- lib/mkit/app/templates/docker/docker_run.sh.erb
|
|
446
473
|
- lib/mkit/app/templates/haproxy/0000_defaults.cfg
|
|
447
474
|
- lib/mkit/app/templates/haproxy/app_haproxy.cfg.erb
|
|
448
475
|
- lib/mkit/app/templates/haproxy/xapp_haproxy.cfg.erb
|
|
@@ -453,8 +480,6 @@ files:
|
|
|
453
480
|
- lib/mkit/client/log_websocket_client.rb
|
|
454
481
|
- lib/mkit/client/mkitd_client.rb
|
|
455
482
|
- lib/mkit/client/websocket_client.rb
|
|
456
|
-
- lib/mkit/cmd/shell_client.rb
|
|
457
|
-
- lib/mkit/cmd_runner.rb
|
|
458
483
|
- lib/mkit/config/config.rb
|
|
459
484
|
- lib/mkit/config/environment.rb
|
|
460
485
|
- lib/mkit/config/initializers/001_hash.rb
|
|
@@ -462,14 +487,36 @@ files:
|
|
|
462
487
|
- lib/mkit/config/initializers/003_custom_exceptions.rb
|
|
463
488
|
- lib/mkit/config/load_default_configs.rb
|
|
464
489
|
- lib/mkit/config/the_config.yml
|
|
490
|
+
- lib/mkit/container/abstract.rb
|
|
491
|
+
- lib/mkit/container/api.rb
|
|
492
|
+
- lib/mkit/container/containers.rb
|
|
493
|
+
- lib/mkit/container/docker/api.rb
|
|
494
|
+
- lib/mkit/container/docker/containers.rb
|
|
495
|
+
- lib/mkit/container/docker/events.rb
|
|
496
|
+
- lib/mkit/container/docker/mapper.rb
|
|
497
|
+
- lib/mkit/container/docker/networks.rb
|
|
498
|
+
- lib/mkit/container/docker/payload.rb
|
|
499
|
+
- lib/mkit/container/docker/stream_demux.rb
|
|
500
|
+
- lib/mkit/container/docker/volumes.rb
|
|
501
|
+
- lib/mkit/container/errors.rb
|
|
502
|
+
- lib/mkit/container/event.rb
|
|
503
|
+
- lib/mkit/container/events.rb
|
|
504
|
+
- lib/mkit/container/http/unix_client.rb
|
|
505
|
+
- lib/mkit/container/info.rb
|
|
506
|
+
- lib/mkit/container/networks.rb
|
|
507
|
+
- lib/mkit/container/registry.rb
|
|
508
|
+
- lib/mkit/container/spec.rb
|
|
509
|
+
- lib/mkit/container/utf8_buffer.rb
|
|
510
|
+
- lib/mkit/container/volumes.rb
|
|
465
511
|
- lib/mkit/ctypes.rb
|
|
466
512
|
- lib/mkit/exceptions.rb
|
|
467
513
|
- lib/mkit/job_manager.rb
|
|
468
514
|
- lib/mkit/mkit_dns.rb
|
|
469
515
|
- lib/mkit/mkit_interface.rb
|
|
470
|
-
- lib/mkit/pods/
|
|
471
|
-
- lib/mkit/pods/
|
|
472
|
-
- lib/mkit/pods/
|
|
516
|
+
- lib/mkit/pods/container_exec_command.rb
|
|
517
|
+
- lib/mkit/pods/container_listener.rb
|
|
518
|
+
- lib/mkit/pods/container_log_listener.rb
|
|
519
|
+
- lib/mkit/pods/pod_reconciler.rb
|
|
473
520
|
- lib/mkit/sagas/asaga.rb
|
|
474
521
|
- lib/mkit/sagas/create_pod_saga.rb
|
|
475
522
|
- lib/mkit/sagas/destroy_pod_saga.rb
|
|
@@ -505,7 +552,6 @@ homepage: https://github.com/valexsantos/mkit
|
|
|
505
552
|
licenses:
|
|
506
553
|
- MIT
|
|
507
554
|
metadata: {}
|
|
508
|
-
post_install_message:
|
|
509
555
|
rdoc_options: []
|
|
510
556
|
require_paths:
|
|
511
557
|
- lib
|
|
@@ -520,8 +566,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
520
566
|
- !ruby/object:Gem::Version
|
|
521
567
|
version: '0'
|
|
522
568
|
requirements: []
|
|
523
|
-
rubygems_version: 3.
|
|
524
|
-
signing_key:
|
|
569
|
+
rubygems_version: 3.6.7
|
|
525
570
|
specification_version: 4
|
|
526
571
|
summary: Micro Kubernets on Ruby
|
|
527
572
|
test_files: []
|
|
@@ -1,106 +0,0 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
|
|
3
|
-
require 'mkit/cmd_runner'
|
|
4
|
-
|
|
5
|
-
module MKIt
|
|
6
|
-
module DockerHelper
|
|
7
|
-
# from ERB template
|
|
8
|
-
def create_instance(cmd)
|
|
9
|
-
MKIt::CmdRunner.run(cmd)
|
|
10
|
-
end
|
|
11
|
-
|
|
12
|
-
def start_instance(instance_id)
|
|
13
|
-
MKIt::CmdRunner.run("docker start #{instance_id}")
|
|
14
|
-
end
|
|
15
|
-
|
|
16
|
-
def stop_instance(instance_id)
|
|
17
|
-
MKIt::CmdRunner.run("docker stop #{instance_id}")
|
|
18
|
-
end
|
|
19
|
-
|
|
20
|
-
def remove_instance(instance)
|
|
21
|
-
MKIt::CmdRunner.run("docker rm -f #{instance}")
|
|
22
|
-
end
|
|
23
|
-
|
|
24
|
-
def inspect_instance(instance_id)
|
|
25
|
-
# this one does not work on ubunto MKIt::CmdRunner.run("docker inspect #{instance_id}")
|
|
26
|
-
x = `docker inspect #{instance_id}`
|
|
27
|
-
JSON.parse(x).first
|
|
28
|
-
end
|
|
29
|
-
|
|
30
|
-
def execute_local(instance_id, cmd)
|
|
31
|
-
MKIt::CmdRunner.run("docker exec -it #{instance_id} #{cmd}")
|
|
32
|
-
end
|
|
33
|
-
|
|
34
|
-
#
|
|
35
|
-
# logs
|
|
36
|
-
#
|
|
37
|
-
def logs(instance_id)
|
|
38
|
-
`docker logs -n 20 #{instance_id}`
|
|
39
|
-
end
|
|
40
|
-
|
|
41
|
-
def logfile(instance_id)
|
|
42
|
-
`docker inspect --format='{{.LogPath}}' #{instance_id}`
|
|
43
|
-
end
|
|
44
|
-
|
|
45
|
-
def clear_logs(instance_id)
|
|
46
|
-
`echo > #{logfile(instance_id)}`
|
|
47
|
-
end
|
|
48
|
-
|
|
49
|
-
#
|
|
50
|
-
# network
|
|
51
|
-
#
|
|
52
|
-
|
|
53
|
-
def create_network(network_name)
|
|
54
|
-
MKIt::CmdRunner.run("docker network create #{network_name}")
|
|
55
|
-
end
|
|
56
|
-
|
|
57
|
-
def network_exists?(network_name)
|
|
58
|
-
x = MKIt::CmdRunner.run('docker network ls')
|
|
59
|
-
x.match(/\b#{network_name}\b/)
|
|
60
|
-
end
|
|
61
|
-
|
|
62
|
-
def dettach_network(network_id, instance_id)
|
|
63
|
-
MKIt::CmdRunner.run("docker network disconnect #{network_id} #{instance_id}")
|
|
64
|
-
end
|
|
65
|
-
|
|
66
|
-
def attach_network(network_id, instance_id)
|
|
67
|
-
MKIt::CmdRunner.run("docker network connect #{network_id} #{instance_id}")
|
|
68
|
-
end
|
|
69
|
-
|
|
70
|
-
def remove_network(network_id)
|
|
71
|
-
MKIt::CmdRunner.run("docker network rm #{network_id}")
|
|
72
|
-
end
|
|
73
|
-
|
|
74
|
-
#
|
|
75
|
-
# volumes
|
|
76
|
-
#
|
|
77
|
-
|
|
78
|
-
def create_volume(volume_name)
|
|
79
|
-
MKIt::CmdRunner.run("docker volume create #{volume_name}")
|
|
80
|
-
end
|
|
81
|
-
|
|
82
|
-
def delete_volume(volume_name)
|
|
83
|
-
MKIt::CmdRunner.run("docker volume rm #{volume_name}")
|
|
84
|
-
end
|
|
85
|
-
|
|
86
|
-
def inspect_volume(volume_name)
|
|
87
|
-
x = MKIt::CmdRunner.run("docker volume inspect #{volume_name}")
|
|
88
|
-
JSON.parse(x).first
|
|
89
|
-
end
|
|
90
|
-
|
|
91
|
-
##
|
|
92
|
-
# cpu limits
|
|
93
|
-
def to_docker_cpu_limit(k8s_cpu_limits)
|
|
94
|
-
if k8s_cpu_limits.nil?
|
|
95
|
-
nil
|
|
96
|
-
else
|
|
97
|
-
cpu_limit = k8s_cpu_limits.to_s
|
|
98
|
-
if cpu_limit.include?('m')
|
|
99
|
-
cpu_limit = cpu_limit.delete_suffix('m')
|
|
100
|
-
cpu_limit = (cpu_limit.to_f / 1000).to_s
|
|
101
|
-
end
|
|
102
|
-
cpu_limit
|
|
103
|
-
end
|
|
104
|
-
end
|
|
105
|
-
end
|
|
106
|
-
end
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
docker run -d --name <%=name%> \
|
|
2
|
-
<%service.service_config&.select{ |x| x.ctype == MKIt::CType::ENVIRONMENT.to_s }.each { |env|%><%=" -e #{env.key}=\"#{env.value}\""%><%}%> \
|
|
3
|
-
<%service.volume&.each { |vol|%><%=" -v \"#{vol.name}:#{vol.path}\""%><%}%> \
|
|
4
|
-
--network <%=service.pods_network%> \
|
|
5
|
-
--dns <%=service.my_dns%> \
|
|
6
|
-
<%="--cpus #{to_docker_cpu_limit(service.resource.cpu_limits)}" unless service.resource.cpu_limits.nil?%> \
|
|
7
|
-
<%="--memory #{service.resource.memory_limits}" unless service.resource.memory_limits.nil?%> \
|
|
8
|
-
<%="--memory-swap #{service.resource.memory_swap_limits}" unless service.resource.memory_swap_limits.nil?%> \
|
|
9
|
-
<%=service.image%> \
|
|
10
|
-
<%=service.command unless service.command.nil?%>
|
|
@@ -1,57 +0,0 @@
|
|
|
1
|
-
# frozen_string_literal: true
|
|
2
|
-
module MKIt
|
|
3
|
-
class ExitShell < RuntimeError; end
|
|
4
|
-
|
|
5
|
-
class ShellClient
|
|
6
|
-
def initialize(command:)
|
|
7
|
-
@command = command
|
|
8
|
-
@logger = MKItLogger
|
|
9
|
-
@logger.debug("Command initialized: [#{@command}]")
|
|
10
|
-
end
|
|
11
|
-
|
|
12
|
-
def unregister
|
|
13
|
-
@logger.info("ending [#{@command}]...")
|
|
14
|
-
if @client
|
|
15
|
-
begin
|
|
16
|
-
@client.raise ExitShell.new
|
|
17
|
-
rescue
|
|
18
|
-
@logger.error("Failed to raise ExitShell")
|
|
19
|
-
end
|
|
20
|
-
@client.exit rescue @logger.warn("Failed to exit client thread")
|
|
21
|
-
end
|
|
22
|
-
end
|
|
23
|
-
|
|
24
|
-
def close
|
|
25
|
-
# no op
|
|
26
|
-
end
|
|
27
|
-
|
|
28
|
-
def register
|
|
29
|
-
@client = Thread.new {
|
|
30
|
-
begin
|
|
31
|
-
PTY.spawn( @command ) do |stdout, stdin, pid |
|
|
32
|
-
begin
|
|
33
|
-
yield stdout, stdin, pid if block_given?
|
|
34
|
-
rescue Errno::EIO
|
|
35
|
-
@logger.warn(
|
|
36
|
-
"Errno:EIO error, but this probably just means that the process has finished giving output"
|
|
37
|
-
)
|
|
38
|
-
rescue ExitShell
|
|
39
|
-
@logger.info("#{@command} ended")
|
|
40
|
-
ensure
|
|
41
|
-
stdin.close rescue @logger.warn("Failed to close stdin")
|
|
42
|
-
stdout.close rescue @logger.warn("Failed to close stdout")
|
|
43
|
-
begin
|
|
44
|
-
close
|
|
45
|
-
rescue => e
|
|
46
|
-
@logger.warn("Error closing client", e)
|
|
47
|
-
end
|
|
48
|
-
Process.wait(pid)
|
|
49
|
-
end
|
|
50
|
-
end
|
|
51
|
-
rescue PTY::ChildExited
|
|
52
|
-
@logger.info("#{@command} exited.")
|
|
53
|
-
end
|
|
54
|
-
}
|
|
55
|
-
end
|
|
56
|
-
end
|
|
57
|
-
end
|
data/lib/mkit/cmd_runner.rb
DELETED
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
require 'pty'
|
|
2
|
-
require 'mkit/exceptions'
|
|
3
|
-
|
|
4
|
-
module MKIt
|
|
5
|
-
class CmdRunner
|
|
6
|
-
def self.run(cmd)
|
|
7
|
-
result=''
|
|
8
|
-
begin
|
|
9
|
-
shell = PTY.spawn( cmd )
|
|
10
|
-
begin
|
|
11
|
-
shell[0].each { |line| result << line.strip! }
|
|
12
|
-
rescue Errno::EIO
|
|
13
|
-
# nothing
|
|
14
|
-
ensure
|
|
15
|
-
shell[0].close
|
|
16
|
-
end
|
|
17
|
-
shell[1].close
|
|
18
|
-
Process.wait(shell[2])
|
|
19
|
-
rescue PTY::ChildExited
|
|
20
|
-
# nothing
|
|
21
|
-
end
|
|
22
|
-
raise CmdRunnerException.new("command '#{cmd[0..30]}...' returned an error [#{result}] (#{$?})") if !$?.nil? && $?.exitstatus != 0
|
|
23
|
-
result
|
|
24
|
-
end
|
|
25
|
-
end
|
|
26
|
-
end
|
|
27
|
-
|
|
@@ -1,38 +0,0 @@
|
|
|
1
|
-
require "mkit/cmd/shell_client"
|
|
2
|
-
|
|
3
|
-
module MKIt
|
|
4
|
-
class DockerExecCommand < MKIt::ShellClient
|
|
5
|
-
|
|
6
|
-
def initialize(pod, ws, options: {})
|
|
7
|
-
puts "DockerExecCommand: #{options}"
|
|
8
|
-
@pod = pod
|
|
9
|
-
@ws = ws
|
|
10
|
-
command = "docker exec"
|
|
11
|
-
command += " -it" unless options[:detached] == 'true'
|
|
12
|
-
command += " -d" if options[:detached] == 'true'
|
|
13
|
-
command += " #{@pod.name}"
|
|
14
|
-
command += " #{options[:varargs].join(' ')}" if options[:varargs]
|
|
15
|
-
super(command: command)
|
|
16
|
-
end
|
|
17
|
-
|
|
18
|
-
def register
|
|
19
|
-
super do |stdout, stdin, pid|
|
|
20
|
-
@stdout_thread = Thread.new do
|
|
21
|
-
stdout.each_char { |line| @ws.send(line) }
|
|
22
|
-
end
|
|
23
|
-
|
|
24
|
-
@stdin_thread = Thread.new do
|
|
25
|
-
@ws.onmessage do |msg|
|
|
26
|
-
stdin.putc msg
|
|
27
|
-
end
|
|
28
|
-
end
|
|
29
|
-
@stdout_thread.join
|
|
30
|
-
end
|
|
31
|
-
end
|
|
32
|
-
|
|
33
|
-
def close
|
|
34
|
-
@ws.close_websocket unless @ws.nil?
|
|
35
|
-
end
|
|
36
|
-
end
|
|
37
|
-
end
|
|
38
|
-
|
|
@@ -1,123 +0,0 @@
|
|
|
1
|
-
require 'pty'
|
|
2
|
-
require 'mkit/status'
|
|
3
|
-
require "mkit/cmd/shell_client"
|
|
4
|
-
|
|
5
|
-
#
|
|
6
|
-
# https://docs.docker.com/engine/reference/commandline/events
|
|
7
|
-
require 'mkit/app/helpers/docker_helper'
|
|
8
|
-
module MKIt
|
|
9
|
-
class StopThread < RuntimeError; end
|
|
10
|
-
|
|
11
|
-
class DockerListener
|
|
12
|
-
include MKIt::DockerHelper
|
|
13
|
-
|
|
14
|
-
def initialize
|
|
15
|
-
@queue = Queue.new
|
|
16
|
-
@listener = ShellClient.new(command: "docker events --format '{{json .}}'")
|
|
17
|
-
end
|
|
18
|
-
|
|
19
|
-
def enqueue(msg)
|
|
20
|
-
@queue << msg
|
|
21
|
-
end
|
|
22
|
-
|
|
23
|
-
def start
|
|
24
|
-
@consumer.run if register_consumer
|
|
25
|
-
register_listener
|
|
26
|
-
end
|
|
27
|
-
|
|
28
|
-
def stop
|
|
29
|
-
@listener.unregister if @listener
|
|
30
|
-
@consumer.raise StopThread.new
|
|
31
|
-
MKItLogger.info("docker listener stopped")
|
|
32
|
-
end
|
|
33
|
-
|
|
34
|
-
private
|
|
35
|
-
|
|
36
|
-
def parse_message(msg)
|
|
37
|
-
action = msg['Action'].to_sym
|
|
38
|
-
type = msg['Type'].to_sym
|
|
39
|
-
MKItLogger.info("docker <#{type}> <#{action}> received: \n\t#{msg}")
|
|
40
|
-
case type
|
|
41
|
-
when :container
|
|
42
|
-
pod_id = msg.id
|
|
43
|
-
pod_name = msg.Actor.Attributes.name
|
|
44
|
-
pod = Pod.find_by(name: pod_name)
|
|
45
|
-
unless pod.nil?
|
|
46
|
-
case action
|
|
47
|
-
when :create
|
|
48
|
-
pod.pod_id = pod_id
|
|
49
|
-
pod.status = MKIt::Status::CREATED
|
|
50
|
-
pod.save
|
|
51
|
-
pod.service.update_status!
|
|
52
|
-
when :start
|
|
53
|
-
pod.pod_id = pod_id
|
|
54
|
-
pod.save
|
|
55
|
-
pod.service.update_status!
|
|
56
|
-
when :kill
|
|
57
|
-
pod.service.update_status!
|
|
58
|
-
when :die
|
|
59
|
-
pod.service.update_status!
|
|
60
|
-
when :stop
|
|
61
|
-
pod.service.update_status!
|
|
62
|
-
else
|
|
63
|
-
MKItLogger.debug(" #{type} #{action} <<TODO>>")
|
|
64
|
-
end
|
|
65
|
-
else
|
|
66
|
-
MKItLogger.warn("docker <<#{type}>> <#{action}> received: #{msg}. But I don't know anything about pod #{pod_id}/#{pod_name}")
|
|
67
|
-
end
|
|
68
|
-
when :network
|
|
69
|
-
pod_id = msg.Actor.Attributes.container
|
|
70
|
-
inspect = inspect_instance(pod_id)
|
|
71
|
-
unless inspect.nil?
|
|
72
|
-
inspect = inspect.to_o
|
|
73
|
-
pod_name = inspect.Name[1..]
|
|
74
|
-
pod = Pod.find_by(name: pod_name)
|
|
75
|
-
unless pod.nil?
|
|
76
|
-
case action
|
|
77
|
-
when :connect
|
|
78
|
-
MKItLogger.info("docker network #{action} received: #{msg} for pod #{pod_name}")
|
|
79
|
-
pod.update_ip
|
|
80
|
-
pod.save
|
|
81
|
-
when :disconnect
|
|
82
|
-
MKItLogger.debug(" #{type} #{action} <<NOOP / TODO>>")
|
|
83
|
-
else
|
|
84
|
-
MKItLogger.debug(" #{type} #{action} <<TODO>>")
|
|
85
|
-
end
|
|
86
|
-
else
|
|
87
|
-
MKItLogger.warn("docker <<#{type}>> <#{action}> received: #{msg}. But I don't know anything about pod #{pod_id}/#{pod_name}")
|
|
88
|
-
end
|
|
89
|
-
else
|
|
90
|
-
MKItLogger.warn("docker <<#{type}>> <#{action}> received: #{msg}. But I don't know anything about pod #{pod_id}")
|
|
91
|
-
end
|
|
92
|
-
else
|
|
93
|
-
MKItLogger.info("\t#{type} #{action} <<unknown>>")
|
|
94
|
-
end
|
|
95
|
-
end
|
|
96
|
-
|
|
97
|
-
def register_consumer
|
|
98
|
-
return false unless @consumer.nil?
|
|
99
|
-
|
|
100
|
-
@consumer = Thread.new do
|
|
101
|
-
running = true
|
|
102
|
-
while running
|
|
103
|
-
begin
|
|
104
|
-
parse_message(@queue.pop)
|
|
105
|
-
rescue StopThread
|
|
106
|
-
running = false
|
|
107
|
-
MKItLogger.info("docker consumer ended")
|
|
108
|
-
rescue => e
|
|
109
|
-
MKItLogger.error("error while consuming docker notification: #{e}", e.message, e.backtrace.join("\n"))
|
|
110
|
-
end
|
|
111
|
-
end
|
|
112
|
-
end
|
|
113
|
-
true
|
|
114
|
-
end
|
|
115
|
-
|
|
116
|
-
def register_listener
|
|
117
|
-
@listener.register do |stdout, stdin, pid|
|
|
118
|
-
stdout.each { |line| enqueue JSON.parse(line).to_o }
|
|
119
|
-
end
|
|
120
|
-
end
|
|
121
|
-
end
|
|
122
|
-
end
|
|
123
|
-
|
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
require "mkit/cmd/shell_client"
|
|
2
|
-
require "mkit/app/helpers/docker_helper"
|
|
3
|
-
|
|
4
|
-
module MKIt
|
|
5
|
-
class DockerLogListener < MKIt::ShellClient
|
|
6
|
-
|
|
7
|
-
include DockerHelper
|
|
8
|
-
|
|
9
|
-
def initialize(pod, ws, options: {})
|
|
10
|
-
if options[:clear]
|
|
11
|
-
clear_logs(pod.name)
|
|
12
|
-
end
|
|
13
|
-
@pod = pod
|
|
14
|
-
@ws = ws
|
|
15
|
-
command = "docker logs"
|
|
16
|
-
command += " -f" if options[:follow] == 'true'
|
|
17
|
-
command += " -n #{options[:nr_lines]}" if options[:nr_lines]
|
|
18
|
-
command += " -n 10" unless options[:nr_lines]
|
|
19
|
-
command += " -t" if options[:timestamps] == 'true'
|
|
20
|
-
command += " --since #{options[:since]}" if options[:since]
|
|
21
|
-
command += " --until #{options[:until]}" if options[:until]
|
|
22
|
-
command += " --details" if options[:details] == 'true'
|
|
23
|
-
command += " #{@pod.name}"
|
|
24
|
-
super(command: command)
|
|
25
|
-
end
|
|
26
|
-
|
|
27
|
-
def register
|
|
28
|
-
super do |stdout, stdin, pid|
|
|
29
|
-
stdout.each {
|
|
30
|
-
|line| @ws.send(line.strip!)
|
|
31
|
-
}
|
|
32
|
-
end
|
|
33
|
-
end
|
|
34
|
-
|
|
35
|
-
def close
|
|
36
|
-
@ws.close_websocket unless @ws.nil?
|
|
37
|
-
end
|
|
38
|
-
end
|
|
39
|
-
end
|
|
40
|
-
|