kuber_kit 0.1.8 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37500e0f3feb9e241251e04ae72ed0cc618d5dadf3e1c660a05658a0e5fefa15
-  data.tar.gz: 82d7c67f5f421fed5cbb94f14ad153dcb6f6f2f068817ffd518f6c0ea7cfe3f8
+  metadata.gz: d3acad6e0224702a4f70ae02d93c16bc766e1e36d75ee33cbc5d2fb15118d35e
+  data.tar.gz: 8903414dfacb859f883298b21ac2d30dd08e93597044e325b253c0f5cd5c8709
 SHA512:
-  metadata.gz: 63c544b4ee93bf01f7d36720effff85052643583b008d68327c10bcbceb5711bce976856da1e6c56c9f877720eb2735447574e534f9f97a966777156ee01bda3
-  data.tar.gz: d388233a8636e884ee033971bf8365f3b5e753dc43a22b5e03702dda764e0632003dc80448fd7a9f3378e98539e06bc25f8163dcd6c85fdd67afddba2f141c80
+  metadata.gz: e5c368de0b96bfd89f80004d1c4fa0a0a5355c6116768fd0b86d7eb0191719ba11b646b1e202f40c08276d06bfb50d423659cb49a488f9573788a51638273cdc
+  data.tar.gz: c0da8c721a80b02b41ee4c6430c175678f792271c3e9f10fba55784e7ea7f8013ffd09b989c043a723c234350340347176ab5c59541e3e1b9b98ebb60f6800dc

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.1.8)
+    kuber_kit (0.2.3)
       cli-ui
       contracts-lite
       dry-auto_inject
+      net-ssh
       thor
 
 GEM
@@ -25,10 +26,11 @@ GEM
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.9)
+    dry-core (0.4.10)
       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
+
+```
+bundle exec bin/kit compile ruby_app,ruby_app2 --path=./example
+```
+
+### Launch deployment
 
 ```
-bin/kit compile ruby_app,ruby_app2 --path=./example -C review
+bundle exec 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,6 +1,8 @@
-- limit amount of simultaneous image builds
+- find a way to launch job on each run, e.g. for migrations
+- allow setting default configuration for kuberkit using env variable
+- implement interactive shell.exec!
+- allow deploying only services enabled for specific configuration
 - list services and require confirmation before deployment
-- service factory should make sure that template exists
-- add build servers support
 - 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/bin/kit

@@ -2,7 +2,6 @@
 # -*- encoding: utf-8 -*-
 
 require 'rubygems'
-require 'bundler/setup'
 require "kuber_kit"
 
 KuberKit::CLI.start(ARGV)

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/services/env_file.rb

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

data/example/services/ruby_app.rb

@@ -1,4 +1,5 @@
 KuberKit
   .define_service(:ruby_app)
   .template(:service)
-  .images(:ruby_app)
+  .images(:ruby_app)
+  .tags("app")

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,22 +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'
@@ -93,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
@@ -144,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
@@ -212,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,8 +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)
@@ -62,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

@@ -11,7 +11,10 @@ class KuberKit::Actions::EnvFileReader
   def call(env_file_name, options)
     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,6 +1,7 @@
 class KuberKit::Actions::ImageCompiler
   include KuberKit::Import[
     "image_compiler.image_dependency_resolver",
+    "image_compiler.build_server_pool_factory",
     "shell.local_shell",
     "tools.logger",
     "ui",
@@ -10,29 +11,32 @@ class KuberKit::Actions::ImageCompiler
   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|
-          image_compiler.call(local_shell, 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}")

data/lib/kuber_kit/actions/kubectl_applier.rb

@@ -7,13 +7,17 @@ class KuberKit::Actions::KubectlApplier
 
   Contract String, Hash => Any
   def call(file_path, options)
-    kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
+    kubeconfig_path  = KuberKit.current_configuration.kubeconfig_path
+    deploy_namespace = KuberKit.current_configuration.deploy_namespace
     ui.create_task("Applying file: #{file_path}") do |task|
-      kubectl_commands.apply_file(local_shell, file_path, kubeconfig_path: kubeconfig_path)
+      kubectl_commands.apply_file(local_shell, file_path, kubeconfig_path: kubeconfig_path, namespace: deploy_namespace)
       task.update_title("Applied file: #{file_path}")
     end
-    nil
+
+    true
   rescue KuberKit::Error => e
     ui.print_error("Error", e.message)
+    
+    false
   end
 end

data/lib/kuber_kit/actions/kubectl_attacher.rb

@@ -0,0 +1,26 @@
+class KuberKit::Actions::KubectlAttacher
+  include KuberKit::Import[
+    "shell.kubectl_commands",
+    "shell.local_shell",
+    "ui"
+  ]
+
+  Contract String, Hash => Any
+  def call(pod_name, options)
+    kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
+    deploy_namespace = KuberKit.current_configuration.deploy_namespace
+
+    kubectl_commands.exec(
+      local_shell, pod_name, "bash", args: "-it", 
+      kubeconfig_path: kubeconfig_path, 
+      interactive: true,
+      namespace: deploy_namespace
+    )
+
+    true
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+    
+    false
+  end
+end

data/lib/kuber_kit/actions/service_deployer.rb

@@ -14,6 +14,10 @@ class KuberKit::Actions::ServiceDeployer
     tags:       Maybe[ArrayOf[String]],
   ] => Any
   def call(services:, tags:)
+    if services.empty? && tags.empty?
+      services, tags = show_tags_selection
+    end
+
     service_names = service_list_resolver.resolve(
       services: services || [],
       tags:     tags || []
@@ -31,8 +35,12 @@ class KuberKit::Actions::ServiceDeployer
 
     compile_images(images_names)
     deploy_services(service_names)
+
+    true
   rescue KuberKit::Error => e
     ui.print_error("Error", e.message)
+
+    false
   end
 
   def deploy_services(service_names)
@@ -55,4 +63,27 @@ class KuberKit::Actions::ServiceDeployer
   def compile_images(images_names)
     image_compiler.call(images_names, {}) if images_names.any?
   end
+
+  def show_tags_selection()
+    specific_service_option = "deploy specific service"
+
+    tags = [specific_service_option]
+    tags += service_store.all_definitions.values.map(&:to_service_attrs).map(&:tags).flatten.uniq.map(&:to_s)
+
+    ui.prompt("Please select which tag to deploy", tags) do |selected_tag|
+      if selected_tag == specific_service_option
+        show_service_selection
+      else
+        return [[], [selected_tag]]
+      end
+    end
+  end
+
+  def show_service_selection()
+    services = service_store.all_definitions.values.map(&:service_name).uniq.map(&:to_s)
+
+    ui.prompt("Please select which service to deploy", services) do |selected_service|
+      return [[selected_service], []]
+    end
+  end
 end