kuber_kit 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5df957bf6c31a193caef5d2fc163be4d925ba6dc3bd61f2d98c47f0eee2bb42
-  data.tar.gz: 701748c782360287b41acd34dcd33a3c8d9192a2ba91685a5355dddbe4b19789
+  metadata.gz: 3f53003404cfe3339fb14d864f9b217dd93332d1c0d451ff34909a3a7224e2ab
+  data.tar.gz: c603662e4f86eebe2d0b4fa114576cef1518b4ce7c879c46a3bca8753f37eed9
 SHA512:
-  metadata.gz: f4d10fbac924851b0552f1b833e8080203277245055717a5a7592437284eb9a5cd0535c369764ca474bc7a09686517254423fec45aeb2ccd8568d22c1851cf63
-  data.tar.gz: 1972b5f5cdd6cb8e8b1f33ae210ac783f3ff55e1c36f6304c933c2a43b3b335ff40b9400fd725be957227b3ed8160327d8d19f0352abf9b9596e4f0b0855716d
+  metadata.gz: 6cc09c80cd1506066efc6ddb86b0bc01d7767fadaeab87fc5d7ca7275034505420d09c45f08566e42afe7e4bee0e89f16c298f8d3ee1010aef03c898b8c5de29
+  data.tar.gz: 89276b25a1de67c89386c86f584c558e4becb0ae100ae8a9f34bc230be6d81a9f1948965a5aa148173d005922757de8598ef7306561a4547700433b5cbc7ca08

data/Gemfile.lock

@@ -1,16 +1,17 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.1.5)
+    kuber_kit (0.2.0)
       cli-ui
       contracts-lite
       dry-auto_inject
+      net-ssh
       thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    cli-ui (1.3.0)
+    cli-ui (1.4.0)
     coderay (1.1.3)
     concurrent-ruby (1.1.7)
     contracts-lite (0.15.0)
@@ -29,6 +30,7 @@ GEM
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
     method_source (1.0.0)
+    net-ssh (6.1.0)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)

data/README.md

@@ -1,4 +1,8 @@
-# Docker Kit
+# KuberKit
+
+[![Codeship Status for ArtStation/kuber_kit](https://app.codeship.com/projects/1286f0a6-3f90-4c1b-b426-721ed8a6571b/status?branch=master)](https://app.codeship.com/projects/417264)
+
+Solution for building & deploying applications on Kubernetes, written in Ruby.
 
 ## Installation
 
@@ -8,12 +12,21 @@ Add this line to your application's Gemfile:
 gem 'kuber_kit'
 ```
 
-## Launch compilation for example images
+## Development
+
+### Launch compilation
+
+```
+bin/kit compile ruby_app,ruby_app2 --path=./example
+```
+
+### Launch deployment
 
 ```
-bin/kit compile ruby_app,ruby_app2 --path=./example -C review
+bin/kit compile -s ruby_app,ruby_app2 --path=./example
 ```
 
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/TODO.md

@@ -1,4 +1,5 @@
-- rename service reader to service config reader
-- service factory should make sure that template exists
-- add build servers support
-- add build vars support (use images instead of containers)
+- implement interactive shell.exec!
+- list services and require confirmation before deployment
+- add build vars support (use images instead of containers)
+- template should be able to set default attributes
+- template should be able to depend on image?

data/example/app_data/env_file.yml

@@ -0,0 +1,10 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: env-secret-review
+type: Opaque
+stringData:
+  <% env_file(:test).each do |key, value| -%>
+  <%= key %>: "<%= value %>"
+  <% end -%>

data/example/configurations/review.rb

@@ -1,4 +1,5 @@
 KuberKit
   .define_configuration(:review)
   .use_registry(:review_default, as: :default)
-  .use_artifact(:kuber_kit_repo, as: :kuber_kit_repo)
+  .use_artifact(:kuber_kit_repo, as: :kuber_kit_repo)
+  .use_build_server(:remote_bs)

data/example/images/app_sources/Dockerfile

@@ -1,4 +1,4 @@
-FROM default/ruby
+FROM <%= image_url(:ruby) %>
 
 RUN mkdir -p /app
 WORKDIR /app

data/example/images/ruby_app/image.rb

@@ -3,13 +3,13 @@ KuberKit
   .registry(:default)
   .depends_on(:ruby, :app_sources)
   .before_build do |context_helper, build_dir|
-    # copy file local artifact
+    # copy file: local artifact
     source_path = context_helper.artifact_path(:kuber_kit_example_data, "test.txt")
     target_path = File.join(build_dir, "test.txt")
-    context_helper.shell.exec!("cp #{source_path} #{target_path}")
+    context_helper.shell.sync(source_path, target_path)
 
-    # copy file local artifact
+    # copy file: remote artifact
     source_path = context_helper.artifact_path(:kuber_kit_repo, "README.md")
     target_path = File.join(build_dir, "README.md")
-    context_helper.shell.exec!("cp #{source_path} #{target_path}")
+    context_helper.shell.sync(source_path, target_path)
   end

data/example/infrastructure/build_servers.rb

@@ -0,0 +1,8 @@
+ENV['SSH_TEST_HOST'] ||= "indocker.artstn.ninja"
+ENV['SSH_TEST_USER'] ||= "kuber_kit"
+
+KuberKit.add_build_server(
+  KuberKit::Core::BuildServers::BuildServer
+    .new(:remote_bs)
+    .setup(host: ENV['SSH_TEST_HOST'], user: ENV['SSH_TEST_USER'], port: 22)
+)

data/example/infrastructure/templates.rb

@@ -1,4 +1,9 @@
 KuberKit.add_template(
   KuberKit::Core::Templates::ArtifactFile
     .new(:service, artifact_name: :kuber_kit_example_data, file_path: "service.yml")
+)
+
+KuberKit.add_template(
+  KuberKit::Core::Templates::ArtifactFile
+    .new(:env_file, artifact_name: :kuber_kit_example_data, file_path: "env_file.yml")
 )

data/example/services/env_file.rb

@@ -0,0 +1,6 @@
+KuberKit
+  .define_service(:env_file)
+  .template(:env_file)
+  .attributes(
+    deployment_restart_enabled: false
+  )

data/kuber_kit.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dry-auto_inject"
   spec.add_dependency "thor"
   spec.add_dependency "cli-ui"
+  spec.add_dependency "net-ssh"
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/kuber_kit.rb

@@ -31,18 +31,7 @@ module KuberKit
     autoload :ConfigurationFactory, 'core/configuration_factory'
     autoload :Configuration, 'core/configuration'
 
-    module ContextHelper
-      autoload :BaseHelper, 'core/context_helper/base_helper'
-      autoload :ImageHelper, 'core/context_helper/image_helper'
-      autoload :ServiceHelper, 'core/context_helper/service_helper'
-      autoload :ContextHelperFactory, 'core/context_helper/context_helper_factory'
-    end
-
-    module Registries
-      autoload :AbstractRegistry, 'core/registries/abstract_registry'
-      autoload :RegistryStore, 'core/registries/registry_store'
-      autoload :Registry, 'core/registries/registry'
-    end
+    autoload :Store, 'core/store'
 
     module Artifacts
       autoload :AbstractArtifact, 'core/artifacts/abstract_artifact'
@@ -51,12 +40,31 @@ module KuberKit
       autoload :Local, 'core/artifacts/local'
     end
 
+    module BuildServers
+      autoload :AbstractBuildServer, 'core/build_servers/abstract_build_server'
+      autoload :BuildServerStore, 'core/build_servers/build_server_store'
+      autoload :BuildServer, 'core/build_servers/build_server'
+    end
+
     module EnvFiles
       autoload :EnvFileStore, 'core/env_files/env_file_store'
       autoload :AbstractEnvFile, 'core/env_files/abstract_env_file'
       autoload :ArtifactFile, 'core/env_files/artifact_file'
     end
 
+    module ContextHelper
+      autoload :BaseHelper, 'core/context_helper/base_helper'
+      autoload :ImageHelper, 'core/context_helper/image_helper'
+      autoload :ServiceHelper, 'core/context_helper/service_helper'
+      autoload :ContextHelperFactory, 'core/context_helper/context_helper_factory'
+    end
+
+    module Registries
+      autoload :AbstractRegistry, 'core/registries/abstract_registry'
+      autoload :RegistryStore, 'core/registries/registry_store'
+      autoload :Registry, 'core/registries/registry'
+    end
+
     module Templates
       autoload :TemplateStore, 'core/templates/template_store'
       autoload :AbstractTemplate, 'core/templates/abstract_template'
@@ -67,21 +75,28 @@ module KuberKit
   module Tools
     autoload :FilePresenceChecker, 'tools/file_presence_checker'
     autoload :LoggerFactory, 'tools/logger_factory'
-    autoload :FilesSync, 'tools/files_sync'
   end
 
   module Shell
     autoload :AbstractShell, 'shell/abstract_shell'
     autoload :LocalShell, 'shell/local_shell'
+    autoload :SshShell, 'shell/ssh_shell'
+    autoload :SshSession, 'shell/ssh_session'
     autoload :CommandCounter, 'shell/command_counter'
-    autoload :BashCommands, 'shell/bash_commands'
-    autoload :DockerCommands, 'shell/docker_commands'
-    autoload :GitCommands, 'shell/git_commands'
-    autoload :RsyncCommands, 'shell/rsync_commands'
-    autoload :KubectlCommands, 'shell/kubectl_commands'
+
+    module Commands
+      autoload :BashCommands, 'shell/commands/bash_commands'
+      autoload :DockerCommands, 'shell/commands/docker_commands'
+      autoload :GitCommands, 'shell/commands/git_commands'
+      autoload :RsyncCommands, 'shell/commands/rsync_commands'
+      autoload :KubectlCommands, 'shell/commands/kubectl_commands'
+    end
   end
 
   module ImageCompiler
+    autoload :ActionHandler, 'image_compiler/action_handler'
+    autoload :BuildServerPool, 'image_compiler/build_server_pool'
+    autoload :BuildServerPoolFactory, 'image_compiler/build_server_pool_factory'
     autoload :Compiler, 'image_compiler/compiler'
     autoload :ImageBuilder, 'image_compiler/image_builder'
     autoload :ImageBuildDirCreator, 'image_compiler/image_build_dir_creator'
@@ -92,7 +107,6 @@ module KuberKit
   module Preprocessing
     autoload :TextPreprocessor, 'preprocessing/text_preprocessor'
     autoload :FilePreprocessor, 'preprocessing/file_preprocessor'
-    autoload :DirPreprocessor, 'preprocessing/dir_preprocessor'
   end
 
   module ArtifactsSync
@@ -103,9 +117,13 @@ module KuberKit
   end
 
   module EnvFileReader
+    autoload :ActionHandler, 'env_file_reader/action_handler'
     autoload :Reader, 'env_file_reader/reader'
-    autoload :AbstractEnvFileReader, 'env_file_reader/abstract_env_file_reader'
-    autoload :ArtifactFileReader, 'env_file_reader/artifact_file_reader'
+
+    module Strategies
+      autoload :Abstract, 'env_file_reader/strategies/abstract'
+      autoload :ArtifactFile, 'env_file_reader/strategies/artifact_file'
+    end
   end
 
   module TemplateReader
@@ -115,9 +133,9 @@ module KuberKit
   end
 
   module ServiceDeployer
+    autoload :ActionHandler, 'service_deployer/action_handler'
+    autoload :StrategyDetector, 'service_deployer/strategy_detector'
     autoload :Deployer, 'service_deployer/deployer'
-    autoload :ServiceRestarter, 'service_deployer/service_restarter'
-    autoload :ServiceReader, 'service_deployer/service_reader'
     autoload :ServiceListResolver, 'service_deployer/service_list_resolver'
 
     module Strategies
@@ -126,6 +144,11 @@ module KuberKit
     end
   end
 
+  module ServiceReader
+    autoload :ActionHandler, 'service_reader/action_handler'
+    autoload :Reader, 'service_reader/reader'
+  end
+
   module Actions
     autoload :ImageCompiler, 'actions/image_compiler'
     autoload :EnvFileReader, 'actions/env_file_reader'
@@ -134,6 +157,7 @@ module KuberKit
     autoload :ServiceDeployer, 'actions/service_deployer'
     autoload :ConfigurationLoader, 'actions/configuration_loader'
     autoload :KubectlApplier, 'actions/kubectl_applier'
+    autoload :KubectlAttacher, 'actions/kubectl_attacher'
   end
 
   module Extensions
@@ -202,6 +226,10 @@ module KuberKit
       Container["core.template_store"].add(template)
     end
 
+    def add_build_server(build_server)
+      Container["core.build_server_store"].add(build_server)
+    end
+
     def build_helper(&proc)
       KuberKit::Core::ContextHelper::BaseHelper.class_exec(&proc)
     end

data/lib/kuber_kit/actions/configuration_loader.rb

@@ -50,6 +50,11 @@ class KuberKit::Actions::ConfigurationLoader
       files = service_store.load_definitions(services_path)
       task.update_title("Loaded #{files.count} service definitions")
     end
+    
+    true
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+    false
   end
   
   def load_configurations(configurations_path, configuration_name)
@@ -60,13 +65,17 @@ class KuberKit::Actions::ConfigurationLoader
       configuration_name ||= :_default_
     end
 
+    all_configurations = configuration_store.all_definitions.values
     if configuration_store.count == 1 && configuration_name.nil?
-      first_configurations = configuration_store.all_definitions.values.first
+      first_configurations = all_configurations.first
       configuration_name   = first_configurations.configuration_name
     end
 
     if configuration_store.count > 1 && configuration_name.nil?
-      raise KuberKit::Error, "Please set configuration name using -C option"
+      options = all_configurations.map(&:configuration_name).map(&:to_s)
+      ui.prompt("Please select configuration name (or set it using -C option)", options) do |selection|
+        configuration_name = selection
+      end
     end
 
     KuberKit.set_configuration_name(configuration_name)

data/lib/kuber_kit/actions/env_file_reader.rb

@@ -2,16 +2,19 @@ require 'json'
 
 class KuberKit::Actions::EnvFileReader
   include KuberKit::Import[
-    "core.env_file_store",
-    "env_file_reader.reader",
     "shell.local_shell",
-    "ui"
+    "ui",
+    env_file_reader: "env_file_reader.action_handler",
   ]
 
   Contract Symbol, Hash => Any
   def call(env_file_name, options)
-    env_file = env_file_store.get(env_file_name)
-    result = reader.read(local_shell, env_file)
+    result = env_file_reader.call(local_shell, env_file_name)
     ui.print_info(env_file_name.to_s, JSON.pretty_generate(result))
+
+    true
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+    false
   end
 end

data/lib/kuber_kit/actions/image_compiler.rb

@@ -1,37 +1,42 @@
 class KuberKit::Actions::ImageCompiler
   include KuberKit::Import[
-    "image_compiler.compiler",
     "image_compiler.image_dependency_resolver",
+    "image_compiler.build_server_pool_factory",
     "shell.local_shell",
     "tools.logger",
-    "configs",
-    "ui"
+    "ui",
+    image_compiler: "image_compiler.action_handler",
   ]
 
   Contract ArrayOf[Symbol], Hash => Any
   def call(image_names, options)
     build_id = generate_build_id
+    build_server_pool = build_server_pool_factory.create()
 
-    resolved_dependencies = []
-    dependencies = image_dependency_resolver.get_next(image_names)
-
-    while (dependencies - resolved_dependencies).any?
-      compile_simultaneously(dependencies, build_id)
-      resolved_dependencies += dependencies
-      dependencies = image_dependency_resolver.get_next(image_names, resolved: resolved_dependencies)
+    image_dependency_resolver.each_with_deps(image_names) do |dep_image_names|
+      result = compile_simultaneously(dep_image_names, build_id, build_server_pool)
+      abort unless result
     end
 
-    compile_simultaneously(image_names - resolved_dependencies, build_id)
+    build_server_pool.disconnect_all
+
+    true
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+
+    false
   end
 
   private
-    def compile_simultaneously(image_names, build_id)
+    def compile_simultaneously(image_names, build_id, build_server_pool)
       task_group = ui.create_task_group
       image_names.map do |image_name|
 
         logger.info("Started compiling: #{image_name.to_s.green}")
         task_group.add("Compiling #{image_name.to_s.yellow}") do |task|
-          compile_image(image_name, build_id)
+          shell = build_server_pool.get_shell
+          
+          image_compiler.call(shell, image_name, build_id)
 
           task.update_title("Compiled #{image_name.to_s.green}")
           logger.info("Finished compiling: #{image_name.to_s.green}")
@@ -41,16 +46,7 @@ class KuberKit::Actions::ImageCompiler
       task_group.wait
     end
 
-    def compile_image(image_name, build_id)
-      compile_dir = generate_compile_dir(build_id: build_id)
-      compiler.compile(local_shell, image_name, compile_dir)
-    end
-
     def generate_build_id
       Time.now.strftime("%H%M%S")
     end
-
-    def generate_compile_dir(build_id:)
-      File.join(configs.image_compile_dir, build_id)
-    end
 end