kuber_kit 0.1.5 → 0.2.0

data/lib/kuber_kit/actions/kubectl_applier.rb

@@ -12,6 +12,11 @@ class KuberKit::Actions::KubectlApplier
       kubectl_commands.apply_file(local_shell, file_path, kubeconfig_path: kubeconfig_path)
       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,19 @@
+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
+    kubectl_commands.exec(local_shell, pod_name, "bash", args: "-it", kubeconfig_path: kubeconfig_path, interactive: true)
+
+    true
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+    
+    false
+  end
+end

data/lib/kuber_kit/actions/service_deployer.rb

@@ -2,11 +2,11 @@ class KuberKit::Actions::ServiceDeployer
   include KuberKit::Import[
     "actions.image_compiler",
     "service_deployer.service_list_resolver",
-    "service_deployer.deployer",
     "core.service_store",
     "shell.local_shell",
     "tools.logger",
-    "ui"
+    "ui",
+    service_deployer: "service_deployer.action_handler",
   ]
 
   Contract KeywordArgs[
@@ -19,6 +19,10 @@ class KuberKit::Actions::ServiceDeployer
       tags:     tags || []
     )
 
+    unless service_names.any?
+      ui.print_warning "WARNING", "No service found with given options, nothing will be deployed."
+    end
+
     services = service_names.map do |service_name|
       service_store.get_service(service_name.to_sym)
     end
@@ -27,6 +31,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)
@@ -36,7 +46,7 @@ class KuberKit::Actions::ServiceDeployer
 
       logger.info("Started deploying: #{service_name.to_s.green}")
       task_group.add("Deploying #{service_name.to_s.yellow}") do |task|
-        deployer.deploy(local_shell, service_name.to_sym)
+        service_deployer.call(local_shell, service_name.to_sym)
 
         task.update_title("Deployed #{service_name.to_s.green}")
         logger.info("Finished deploying: #{service_name.to_s.green}")

data/lib/kuber_kit/actions/service_reader.rb

@@ -1,17 +1,20 @@
 class KuberKit::Actions::ServiceReader
   include KuberKit::Import[
-    "core.service_store",
-    "service_deployer.service_reader",
     "shell.local_shell",
-    "ui"
+    "ui",
+    service_reader: "service_reader.action_handler",
   ]
 
   Contract Symbol, Hash => Any
   def call(service_name, options)
-    service = service_store.get_service(service_name)
-
-    result = service_reader.read(local_shell, service)
+    result = service_reader.call(local_shell, service_name)
 
     ui.print_info(service_name.to_s, result)
+
+    true
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+
+    false
   end
 end

data/lib/kuber_kit/actions/template_reader.rb

@@ -13,5 +13,10 @@ class KuberKit::Actions::TemplateReader
     result = reader.read(local_shell, template)
 
     ui.print_info(template_name.to_s, result)
+
+    true
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+    false
   end
 end

data/lib/kuber_kit/cli.rb

@@ -14,56 +14,87 @@ class KuberKit::CLI < Thor
     
     image_names = image_names_str.split(",").map(&:strip).map(&:to_sym)
 
-    KuberKit::Container['actions.configuration_loader'].call(options)
-    KuberKit::Container['actions.image_compiler'].call(image_names, options)
+    if KuberKit::Container['actions.configuration_loader'].call(options)
+      result = KuberKit::Container['actions.image_compiler'].call(image_names, options)
+    end
 
     logger = KuberKit::Container['tools.logger']
-    logger.info("---------------------------")
-    logger.info("Image compilation finished!")
-    logger.info("---------------------------")
+    if result
+      logger.info("---------------------------")
+      logger.info("Image compilation finished!")
+      logger.info("---------------------------")
+    else
+      logger.info("-------------------------".red)
+      logger.info("Image compilation failed!".red)
+      logger.info("-------------------------".red)
+    end
+  end
+
+  desc "deploy CONTEXT_NAME", "Deploy CONTEXT_NAME with kubectl"
+  method_option :services,   :type => :array, aliases: ["-s"]
+  method_option :tags,       :type => :array, aliases: ["-t"]
+  def deploy
+    KuberKit.set_debug_mode(options[:debug])
+
+    if KuberKit::Container['actions.configuration_loader'].call(options)
+      result = KuberKit::Container['actions.service_deployer'].call(services: options[:services], tags: options[:tags])
+    end
+
+    logger = KuberKit::Container['tools.logger']
+    if result
+      logger.info("---------------------------")
+      logger.info("Service deployment finished!")
+      logger.info("---------------------------")
+    else
+      logger.info("-------------------------".red)
+      logger.info("Service deployment failed!".red)
+      logger.info("-------------------------".red)
+    end
   end
 
   desc "env ENV_FILE_NAME", "Return content of Env File ENV_FILE_NAME"
   def env(env_file_name)
     KuberKit.set_debug_mode(options[:debug])
 
-    KuberKit::Container['actions.configuration_loader'].call(options)
-    KuberKit::Container['actions.env_file_reader'].call(env_file_name.to_sym, options)
+    if KuberKit::Container['actions.configuration_loader'].call(options)
+      KuberKit::Container['actions.env_file_reader'].call(env_file_name.to_sym, options)
+    end
   end
 
   desc "template TEMPLATE_NAME", "Return content of Template TEMPLATE_NAME"
   def template(template_name)
     KuberKit.set_debug_mode(options[:debug])
 
-    KuberKit::Container['actions.configuration_loader'].call(options)
-    KuberKit::Container['actions.template_reader'].call(template_name.to_sym, options)
+    if KuberKit::Container['actions.configuration_loader'].call(options)
+      KuberKit::Container['actions.template_reader'].call(template_name.to_sym, options)
+    end
   end
 
   desc "service SERVICE_NAME", "Return content of Service SERVICE_NAME"
   def service(service_name)
     KuberKit.set_debug_mode(options[:debug])
 
-    KuberKit::Container['actions.configuration_loader'].call(options)
-    KuberKit::Container['actions.service_reader'].call(service_name.to_sym, options)
+    if KuberKit::Container['actions.configuration_loader'].call(options)
+      KuberKit::Container['actions.service_reader'].call(service_name.to_sym, options)
+    end
   end
 
   desc "apply FILE_PATH", "Apply FILE_PATH with kubectl"
   def apply(file_path)
     KuberKit.set_debug_mode(options[:debug])
 
-    KuberKit::Container['actions.configuration_loader'].call(options)
-    KuberKit::Container['actions.kubectl_applier'].call(File.expand_path(file_path), options)
+    if KuberKit::Container['actions.configuration_loader'].call(options)
+      KuberKit::Container['actions.kubectl_applier'].call(File.expand_path(file_path), options)
+    end
   end
 
-  desc "deploy CONTEXT_NAME", "Deploy CONTEXT_NAME with kubectl"
-  method_option :services,   :type => :array, aliases: ["-s"]
-  method_option :tags,       :type => :array, aliases: ["-t"]
-  def deploy
+  desc "attach POD_NAME", "Attach to POD_NAME with kubectl"
+  def attach(pod_name)
     KuberKit.set_debug_mode(options[:debug])
 
-    KuberKit::Container['actions.configuration_loader'].call(options)
-
-    KuberKit::Container['actions.service_deployer'].call(services: options[:services], tags: options[:tags])
+    if KuberKit::Container['actions.configuration_loader'].call(options)
+      KuberKit::Container['actions.kubectl_attacher'].call(pod_name, options)
+    end
   end
 
   def self.exit_on_failure?

data/lib/kuber_kit/configs.rb

@@ -14,33 +14,35 @@ class KuberKit::Configs
     'tmp',
     'logs'
   ]
-  KUBER_KIT_DIRNAME      = "kuber_kit".freeze
-  IMAGES_DIRNAME         = "images".freeze
-  SERVICES_DIRNAME       = "services".freeze
-  INFRA_DIRNAME          = "infrastructure".freeze
-  CONFIGURATIONS_DIRNAME = "configurations".freeze
-  ARTIFACT_CLONE_DIR     = "/tmp/kuber_kit/artifacts"
-  SERVICE_CONFIG_DIR     = "/tmp/kuber_kit/services"
-  DEPLOY_STRATEGY        = :kubernetes
+  KUBER_KIT_DIRNAME           = "kuber_kit".freeze
+  IMAGES_DIRNAME              = "images".freeze
+  SERVICES_DIRNAME            = "services".freeze
+  INFRA_DIRNAME               = "infrastructure".freeze
+  CONFIGURATIONS_DIRNAME      = "configurations".freeze
+  ARTIFACT_CLONE_DIR          = "/tmp/kuber_kit/artifacts"
+  SERVICE_CONFIG_DIR          = "/tmp/kuber_kit/services"
+  DEPLOY_STRATEGY             = :kubernetes
+  COMPILE_SIMULTANEOUS_LIMIT  = 5
 
   attr_accessor :image_dockerfile_name, :image_build_context_dir, :image_tag,
                 :docker_ignore_list, :image_compile_dir, 
                 :kuber_kit_dirname, :images_dirname, :services_dirname, :infra_dirname, :configurations_dirname,
-                :artifact_clone_dir, :service_config_dir, :deploy_strategy
+                :artifact_clone_dir, :service_config_dir, :deploy_strategy, :compile_simultaneous_limit
 
   def initialize
-    @image_dockerfile_name   = IMAGE_DOCKERFILE_NAME
-    @image_build_context_dir = IMAGE_BUILD_CONTEXT_DIR
-    @image_tag               = IMAGE_TAG
-    @image_compile_dir       = IMAGE_COMPILE_DIR
-    @docker_ignore_list      = DOCKER_IGNORE_LIST
-    @kuber_kit_dirname       = KUBER_KIT_DIRNAME
-    @images_dirname          = IMAGES_DIRNAME
-    @services_dirname        = SERVICES_DIRNAME
-    @infra_dirname           = INFRA_DIRNAME
-    @configurations_dirname  = CONFIGURATIONS_DIRNAME
-    @artifact_clone_dir      = ARTIFACT_CLONE_DIR
-    @service_config_dir      = SERVICE_CONFIG_DIR
-    @deploy_strategy         = DEPLOY_STRATEGY
+    @image_dockerfile_name      = IMAGE_DOCKERFILE_NAME
+    @image_build_context_dir    = IMAGE_BUILD_CONTEXT_DIR
+    @image_tag                  = IMAGE_TAG
+    @image_compile_dir          = IMAGE_COMPILE_DIR
+    @docker_ignore_list         = DOCKER_IGNORE_LIST
+    @kuber_kit_dirname          = KUBER_KIT_DIRNAME
+    @images_dirname             = IMAGES_DIRNAME
+    @services_dirname           = SERVICES_DIRNAME
+    @infra_dirname              = INFRA_DIRNAME
+    @configurations_dirname     = CONFIGURATIONS_DIRNAME
+    @artifact_clone_dir         = ARTIFACT_CLONE_DIR
+    @service_config_dir         = SERVICE_CONFIG_DIR
+    @deploy_strategy            = DEPLOY_STRATEGY
+    @compile_simultaneous_limit = COMPILE_SIMULTANEOUS_LIMIT
   end
 end

data/lib/kuber_kit/container.rb

@@ -29,6 +29,10 @@ class KuberKit::Container
     KuberKit::Actions::KubectlApplier.new
   end
 
+  register "actions.kubectl_attacher" do
+    KuberKit::Actions::KubectlAttacher.new
+  end
+
   register "configs" do
     KuberKit::Configs.new
   end
@@ -69,18 +73,22 @@ class KuberKit::Container
     KuberKit::Core::ConfigurationStore.new
   end
 
-  register "core.registry_store" do
-    KuberKit::Core::Registries::RegistryStore.new
-  end
-
   register "core.artifact_store" do
     KuberKit::Core::Artifacts::ArtifactStore.new
   end
 
+  register "core.build_server_store" do
+    KuberKit::Core::BuildServers::BuildServerStore.new
+  end
+
   register "core.env_file_store" do
     KuberKit::Core::EnvFiles::EnvFileStore.new
   end
 
+  register "core.registry_store" do
+    KuberKit::Core::Registries::RegistryStore.new
+  end
+
   register "core.template_store" do
     KuberKit::Core::Templates::TemplateStore.new
   end
@@ -102,23 +110,23 @@ class KuberKit::Container
   end
 
   register "shell.bash_commands" do
-    KuberKit::Shell::BashCommands.new
+    KuberKit::Shell::Commands::BashCommands.new
   end
 
   register "shell.docker_commands" do
-    KuberKit::Shell::DockerCommands.new
+    KuberKit::Shell::Commands::DockerCommands.new
   end
 
   register "shell.git_commands" do
-    KuberKit::Shell::GitCommands.new
+    KuberKit::Shell::Commands::GitCommands.new
   end
 
   register "shell.rsync_commands" do
-    KuberKit::Shell::RsyncCommands.new
+    KuberKit::Shell::Commands::RsyncCommands.new
   end
 
   register "shell.kubectl_commands" do
-    KuberKit::Shell::KubectlCommands.new
+    KuberKit::Shell::Commands::KubectlCommands.new
   end
 
   register "shell.local_shell" do
@@ -137,8 +145,12 @@ class KuberKit::Container
     KuberKit::Preprocessing::FilePreprocessor.new
   end
 
-  register "preprocessing.dir_preprocessor" do
-    KuberKit::Preprocessing::DirPreprocessor.new
+  register "image_compiler.action_handler" do
+    KuberKit::ImageCompiler::ActionHandler.new
+  end
+
+  register "image_compiler.build_server_pool_factory" do
+    KuberKit::ImageCompiler::BuildServerPoolFactory.new
   end
 
   register "image_compiler.compiler" do
@@ -173,12 +185,16 @@ class KuberKit::Container
     KuberKit::ArtifactsSync::NullArtifactResolver.new
   end
 
+  register "env_file_reader.action_handler" do
+    KuberKit::EnvFileReader::ActionHandler.new
+  end
+
   register "env_file_reader.reader" do
     KuberKit::EnvFileReader::Reader.new
   end
 
-  register "env_file_reader.artifact_file_reader" do
-    KuberKit::EnvFileReader::ArtifactFileReader.new
+  register "env_file_reader.strategies.artifact_file" do
+    KuberKit::EnvFileReader::Strategies::ArtifactFile.new
   end
 
   register "template_reader.reader" do
@@ -189,16 +205,16 @@ class KuberKit::Container
     KuberKit::TemplateReader::ArtifactFileReader.new
   end
 
-  register "service_deployer.deployer" do
-    KuberKit::ServiceDeployer::Deployer.new
+  register "service_deployer.action_handler" do
+    KuberKit::ServiceDeployer::ActionHandler.new
   end
 
-  register "service_deployer.service_restarter" do
-    KuberKit::ServiceDeployer::ServiceRestarter.new
+  register "service_deployer.strategy_detector" do
+    KuberKit::ServiceDeployer::StrategyDetector.new
   end
 
-  register "service_deployer.service_reader" do
-    KuberKit::ServiceDeployer::ServiceReader.new
+  register "service_deployer.deployer" do
+    KuberKit::ServiceDeployer::Deployer.new
   end
 
   register "service_deployer.service_list_resolver" do
@@ -209,6 +225,14 @@ class KuberKit::Container
     KuberKit::ServiceDeployer::Strategies::Kubernetes.new
   end
 
+  register "service_reader.action_handler" do
+    KuberKit::ServiceReader::ActionHandler.new
+  end
+
+  register "service_reader.reader" do
+    KuberKit::ServiceReader::Reader.new
+  end
+
   register "ui" do
     if KuberKit.debug_mode?
       KuberKit::UI::Simple.new

data/lib/kuber_kit/core/artifacts/artifact_store.rb

@@ -1,19 +1,6 @@
 class KuberKit::Core::Artifacts::ArtifactStore
-  NotFoundError = Class.new(KuberKit::NotFoundError)
-  AlreadyAddedError = Class.new(KuberKit::Error)
-
   def add(artifact)
-    @@artifacts ||= {}
-
-    if !artifact.is_a?(KuberKit::Core::Artifacts::AbstractArtifact)
-      raise ArgumentError.new("should be an instance of KuberKit::Core::Artifacts::AbstractArtifact, got: #{artifact.inspect}")
-    end
-
-    unless @@artifacts[artifact.name].nil?
-      raise AlreadyAddedError, "artifact #{artifact.name} was already added"
-    end
-
-    @@artifacts[artifact.name] = artifact
+    store.add(artifact.name, artifact)
   end
 
   def get(artifact_name)
@@ -24,14 +11,7 @@ class KuberKit::Core::Artifacts::ArtifactStore
   end
 
   def get_global(artifact_name)
-    @@artifacts ||= {}
-    artifact = @@artifacts[artifact_name]
-
-    if artifact.nil?
-      raise NotFoundError, "artifact '#{artifact_name}' not found"
-    end
-    
-    artifact
+    store.get(artifact_name)
   end
 
   def get_from_configuration(artifact_name)
@@ -40,6 +20,15 @@ class KuberKit::Core::Artifacts::ArtifactStore
   end
 
   def reset!
-    @@artifacts = {}
+    store.reset!
+  end
+
+  def exists?(artifact_name)
+    store.exists?(artifact_name)
   end
+
+  private
+    def store
+      @@store ||= KuberKit::Core::Store.new(KuberKit::Core::Artifacts::AbstractArtifact)
+    end
 end