kuber_kit 0.3.9 → 0.4.2

data/lib/kuber_kit/container.rb

@@ -258,8 +258,12 @@ class KuberKit::Container
   end
 
   register "ui" do
-    if KuberKit.debug_mode?
+    if KuberKit.ui_mode == :debug
+      KuberKit::UI::Debug.new
+    elsif KuberKit.ui_mode == :simple
       KuberKit::UI::Simple.new
+    elsif KuberKit.ui_mode == :api
+      KuberKit::UI::Api.new
     else
       KuberKit::UI::Interactive.new
     end

data/lib/kuber_kit/core/configuration.rb

@@ -1,35 +1,37 @@
 class KuberKit::Core::Configuration
   attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubeconfig_path, 
-              :deployer_strategy, :deployer_namespace, :services_attributes, :build_servers,
-              :global_build_vars
+              :services_attributes, :build_servers, :global_build_vars,
+              :deployer_strategy, :deployer_namespace, :deployer_require_confirimation
 
   Contract KeywordArgs[
-    name:            Symbol,
-    artifacts:       Hash,
-    registries:      Hash,
-    env_files:       Hash,
-    templates:       Hash,
-    kubeconfig_path: Maybe[String],
-    deployer_strategy:  Symbol,
-    deployer_namespace: Maybe[Symbol],
-    services_attributes: HashOf[Symbol => Hash],
-    build_servers:   ArrayOf[KuberKit::Core::BuildServers::AbstractBuildServer],
-    global_build_vars:   HashOf[Symbol => Any],
+    name:                 Symbol,
+    artifacts:            Hash,
+    registries:           Hash,
+    env_files:            Hash,
+    templates:            Hash,
+    kubeconfig_path:      Maybe[String],
+    services_attributes:  HashOf[Symbol => Hash],
+    build_servers:        ArrayOf[KuberKit::Core::BuildServers::AbstractBuildServer],
+    global_build_vars:    HashOf[Symbol => Any],
+    deployer_strategy:              Symbol,
+    deployer_namespace:             Maybe[Symbol],
+    deployer_require_confirimation: Bool,
   ] => Any
   def initialize(name:, artifacts:, registries:, env_files:, templates:, kubeconfig_path:, 
-                 deployer_strategy:, deployer_namespace:, services_attributes:, build_servers:, 
-                 global_build_vars:)
-    @name             = name
-    @artifacts        = artifacts
-    @registries       = registries
-    @env_files        = env_files
-    @templates        = templates
-    @kubeconfig_path  = kubeconfig_path
-    @deployer_strategy  = deployer_strategy
-    @deployer_namespace = deployer_namespace
-    @build_servers    = build_servers
+                 services_attributes:, build_servers:, global_build_vars:,
+                 deployer_strategy:, deployer_namespace:, deployer_require_confirimation:)
+    @name                 = name
+    @artifacts            = artifacts
+    @registries           = registries
+    @env_files            = env_files
+    @templates            = templates
+    @kubeconfig_path      = kubeconfig_path
+    @build_servers        = build_servers
     @services_attributes  = services_attributes
     @global_build_vars    = global_build_vars
+    @deployer_strategy              = deployer_strategy
+    @deployer_namespace             = deployer_namespace
+    @deployer_require_confirimation = deployer_require_confirimation
   end
 
   def service_attributes(service_name)

data/lib/kuber_kit/core/configuration_definition.rb

@@ -17,18 +17,19 @@ class KuberKit::Core::ConfigurationDefinition
 
   def to_attrs
     OpenStruct.new(
-      name:             @configuration_name,
-      artifacts:        @artifacts,
-      registries:       @registries,
-      env_files:        @env_files,
-      templates:        @templates,
-      kubeconfig_path:  @kubeconfig_path,
-      deployer_strategy:  @deployer_strategy,
-      deployer_namespace: @deployer_namespace,
-      enabled_services: @enabled_services,
-      build_servers:    @build_servers,
+      name:                 @configuration_name,
+      artifacts:            @artifacts,
+      registries:           @registries,
+      env_files:            @env_files,
+      templates:            @templates,
+      kubeconfig_path:      @kubeconfig_path,
+      enabled_services:     @enabled_services,
+      build_servers:        @build_servers,
       services_attributes:  @services_attributes,
       global_build_vars:    @global_build_vars,
+      deployer_strategy:              @deployer_strategy,
+      deployer_namespace:             @deployer_namespace,
+      deployer_require_confirimation: @deployer_require_confirimation || false,
     )
   end
 
@@ -94,6 +95,12 @@ class KuberKit::Core::ConfigurationDefinition
     self
   end
 
+  def deployer_require_confirimation
+    @deployer_require_confirimation = true
+
+    self
+  end
+
   def enabled_services(services)
     if services.is_a?(Hash)
       @enabled_services += services.keys.map(&:to_sym)

data/lib/kuber_kit/core/configuration_factory.rb

@@ -20,17 +20,18 @@ class KuberKit::Core::ConfigurationFactory
     build_servers = fetch_build_servers(configuration_attrs.build_servers)
 
     KuberKit::Core::Configuration.new(
-      name:               configuration_attrs.name,
-      artifacts:          artifacts,
-      registries:         registries,
-      env_files:          env_files,
-      templates:          templates,
-      kubeconfig_path:    configuration_attrs.kubeconfig_path,
-      deployer_strategy:  configuration_attrs.deployer_strategy || configs.deployer_strategy,
-      deployer_namespace: configuration_attrs.deployer_namespace,
-      build_servers:      build_servers,
+      name:                 configuration_attrs.name,
+      artifacts:            artifacts,
+      registries:           registries,
+      env_files:            env_files,
+      templates:            templates,
+      kubeconfig_path:      configuration_attrs.kubeconfig_path,
+      build_servers:        build_servers,
       services_attributes:  configuration_attrs.services_attributes,
       global_build_vars:    configuration_attrs.global_build_vars || {},
+      deployer_strategy:              configuration_attrs.deployer_strategy || configs.deployer_strategy,
+      deployer_namespace:             configuration_attrs.deployer_namespace,
+      deployer_require_confirimation: configuration_attrs.deployer_require_confirimation,
     )
   end
 

data/lib/kuber_kit/core/configuration_store.rb

@@ -3,7 +3,7 @@ class KuberKit::Core::ConfigurationStore
     "core.configuration_factory",
     "core.configuration_definition_factory",
     "shell.local_shell",
-    "tools.logger"
+    "ui"
   ]
 
   def define(configuration_name)
@@ -33,7 +33,7 @@ class KuberKit::Core::ConfigurationStore
       load_definition(path)
     end
   rescue KuberKit::Shell::AbstractShell::DirNotFoundError
-    logger.warn("Directory with configurations not found: #{dir_path}")
+    ui.print_warning("ConfigurationStore", "Directory with configurations not found: #{dir_path}")
     []
   end
 

data/lib/kuber_kit/core/image_store.rb

@@ -3,7 +3,7 @@ class KuberKit::Core::ImageStore
     "core.image_factory",
     "core.image_definition_factory",
     "shell.local_shell",
-    "tools.logger"
+    "ui"
   ]
 
   def define(image_name, image_dir = nil)
@@ -33,7 +33,7 @@ class KuberKit::Core::ImageStore
       load_definition(path)
     end
   rescue KuberKit::Shell::AbstractShell::DirNotFoundError
-    logger.warn("Directory with images not found: #{dir_path}")
+    ui.print_warning("ImageStore", "Directory with images not found: #{dir_path}")
     []
   end
 

data/lib/kuber_kit/core/service_store.rb

@@ -3,7 +3,7 @@ class KuberKit::Core::ServiceStore
     "core.service_factory",
     "core.service_definition_factory",
     "shell.local_shell",
-    "tools.logger"
+    "ui",
   ]
 
   def define(service_name)
@@ -33,7 +33,7 @@ class KuberKit::Core::ServiceStore
       load_definition(path)
     end
   rescue KuberKit::Shell::AbstractShell::DirNotFoundError
-    logger.warn("Directory with services not found: #{dir_path}")
+    ui.print_warning("ServiceStore", "Directory with services not found: #{dir_path}")
     []
   end
 

data/lib/kuber_kit/image_compiler/compiler.rb

@@ -12,7 +12,9 @@ class KuberKit::ImageCompiler::Compiler
     context_helper = context_helper_factory.build_image_context(shell, image)
     image_build_dir_creator.create(shell, image, image_build_dir, context_helper: context_helper)
 
-    image_builder.build(shell, image, image_build_dir, context_helper: context_helper)
+    result = image_builder.build(shell, image, image_build_dir, context_helper: context_helper)
     image_build_dir_creator.cleanup(shell, image_build_dir)
+
+    result
   end
 end

data/lib/kuber_kit/image_compiler/image_builder.rb

@@ -10,7 +10,13 @@ class KuberKit::ImageCompiler::ImageBuilder
   def build(shell, image, build_dir, context_helper: nil)
     image.before_build_callback.call(context_helper, build_dir) if image.before_build_callback
 
-    docker_commands.build(shell, build_dir, ["-t=#{image.registry_url}"])
+    build_options = ["-t=#{image.registry_url}"]
+    # use quite option for api mode ui, so it will only return built image id
+    if KuberKit.ui_mode == :api
+      build_options << "-q"
+    end
+
+    build_result = docker_commands.build(shell, build_dir, build_options)
 
     version_tag = version_tag_builder.get_version
     docker_commands.tag(shell, image.registry_url, version_tag)
@@ -21,5 +27,7 @@ class KuberKit::ImageCompiler::ImageBuilder
     end
 
     image.after_build_callback.call(context_helper, build_dir) if image.after_build_callback
+
+    build_result
   end
 end

data/lib/kuber_kit/service_deployer/strategies/docker.rb

@@ -10,8 +10,10 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
     :image_name,
     :detached,
     :command_name,
-    :command_args,
-    :delete_if_exists
+    :custom_args,
+    :delete_if_exists,
+    :volumes,
+    :networks,
   ]
 
   Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service => Any
@@ -23,8 +25,10 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
     end
     
     container_name = strategy_options.fetch(:container_name, service.uri)
-    command_name   = strategy_options.fetch(:command_name, "bash")
-    command_args   = strategy_options.fetch(:command_args, nil)
+    command_name   = strategy_options.fetch(:command_name, nil)
+    custom_args    = strategy_options.fetch(:custom_args, nil)
+    networks       = strategy_options.fetch(:networks, [])
+    volumes        = strategy_options.fetch(:volumes, [])
 
     image_name = strategy_options.fetch(:image_name, nil)
     if image_name.nil?
@@ -37,10 +41,24 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
       docker_commands.delete_container(shell, container_name)
     end
 
+    custom_args = Array(custom_args)
+    if container_name
+      custom_args << "--name #{container_name}"
+    end
+    networks.each do |network|
+      docker_commands.create_network(shell, network)
+      custom_args << "--network #{network}"
+    end
+    volumes.each do |volume|
+      volume_name, _ = volume.split(":")
+      docker_commands.create_volume(shell, volume_name) unless volume_name.start_with?("/")
+      custom_args << "--volume #{volume}"
+    end
+
     docker_commands.run(
       shell, image.remote_registry_url, 
       command:    command_name,
-      args:       command_args, 
+      args:       custom_args, 
       detached:   !!strategy_options[:detached]
     )
   end

data/lib/kuber_kit/service_deployer/strategies/docker_compose.rb

@@ -8,7 +8,7 @@ class KuberKit::ServiceDeployer::Strategies::DockerCompose < KuberKit::ServiceDe
   STRATEGY_OPTIONS = [
     :service_name, 
     :command_name,
-    :command_args,
+    :custom_args,
     :detached
   ]
 
@@ -25,13 +25,13 @@ class KuberKit::ServiceDeployer::Strategies::DockerCompose < KuberKit::ServiceDe
     end
 
     service_name = strategy_options.fetch(:service_name, service.name.to_s)
-    command_name = strategy_options.fetch(:command_name, "bash")
-    command_args = strategy_options.fetch(:command_args, nil)
+    command_name = strategy_options.fetch(:command_name, nil)
+    custom_args  = strategy_options.fetch(:custom_args, nil)
 
     docker_compose_commands.run(shell, config_path, 
       service:  service_name, 
       command:  command_name,
-      args:     command_args, 
+      args:     custom_args, 
       detached: !!strategy_options[:detached]
     )
   end

data/lib/kuber_kit/service_deployer/strategies/kubernetes.rb

@@ -39,7 +39,7 @@ class KuberKit::ServiceDeployer::Strategies::Kubernetes < KuberKit::ServiceDeplo
       kubectl_commands.delete_resource(shell, resource_type, resource_name, kubeconfig_path: kubeconfig_path, namespace: namespace)
     end
 
-    kubectl_commands.apply_file(shell, config_path, kubeconfig_path: kubeconfig_path, namespace: namespace)
+    apply_result = kubectl_commands.apply_file(shell, config_path, kubeconfig_path: kubeconfig_path, namespace: namespace)
 
     restart_enabled = strategy_options.fetch(:restart_if_exists, true)
     if restart_enabled && resource_exists
@@ -48,5 +48,7 @@ class KuberKit::ServiceDeployer::Strategies::Kubernetes < KuberKit::ServiceDeplo
         kubeconfig_path: kubeconfig_path, namespace: namespace
       )
     end
+    
+    apply_result
   end
 end

data/lib/kuber_kit/shell/commands/docker_commands.rb

@@ -3,7 +3,7 @@ class KuberKit::Shell::Commands::DockerCommands
     default_args = ["--rm=true"]
     args_list = (default_args + args).join(" ")
 
-    shell.exec!(%Q{docker build #{build_dir} #{args_list}})
+    shell.exec!(%Q{docker image build #{build_dir} #{args_list}})
   end
 
   def tag(shell, image_name, tag_name)
@@ -18,7 +18,7 @@ class KuberKit::Shell::Commands::DockerCommands
     command_parts = []
     command_parts << "docker run"
     command_parts << "-d" if detached
-    command_parts << args if args
+    command_parts << Array(args).join(" ") if args
     command_parts << image_name
     command_parts << command if command
 
@@ -29,26 +29,67 @@ class KuberKit::Shell::Commands::DockerCommands
     end
   end
 
-  def container_exists?(shell, container_name)
-    result = get_container_id(shell, container_name)
+  def container_exists?(shell, container_name, status: nil)
+    result = get_containers(shell, container_name, status: status)
     result && result != ""
   end
 
-  def delete_container(shell, container_name)
-    shell.exec!(%Q{docker rm -f #{container_name}})
-  end
-
-  def get_container_id(shell, container_name, only_healthy: false, status: "running")
+  def get_containers(shell, container_name, only_healthy: false, status: nil)
     command_parts = []
     command_parts << "docker ps -a -q"
 
     if only_healthy
       command_parts << "--filter=\"health=healthy\""
     end
-
-    command_parts << "--filter=\"status=#{status}\""
+    if status
+      command_parts << "--filter=\"status=#{status}\""
+    end
     command_parts << "--filter=\"name=#{container_name}\""
 
     shell.exec!(command_parts.join(" "))
   end
+
+  def delete_container(shell, container_name)
+    shell.exec!("docker rm -f #{container_name}")
+  end
+
+  def create_network(shell, name)
+    unless network_exists?(shell, name)
+      shell.exec!("docker network create #{name}")
+    end
+  end
+
+  def network_exists?(shell, network_name)
+    result = get_networks(shell, network_name)
+    result && result != ""
+  end
+
+  def get_networks(shell, network_name)
+    command_parts = []
+    command_parts << "docker network ls"
+    command_parts << "--filter=\"name=#{network_name}\""
+    command_parts << "--format \"{{.Name}}\""
+
+    shell.exec!(command_parts.join(" "))
+  end
+
+  def create_volume(shell, name)
+    unless volume_exists?(shell, name)
+      shell.exec!("docker volume create #{name}")
+    end
+  end
+
+  def volume_exists?(shell, volume_name)
+    result = get_volumes(shell, volume_name)
+    result && result != ""
+  end
+
+  def get_volumes(shell, volume_name)
+    command_parts = []
+    command_parts << "docker volume ls"
+    command_parts << "--filter=\"name=#{volume_name}\""
+    command_parts << "--format \"{{.Name}}\""
+
+    shell.exec!(command_parts.join(" "))
+  end
 end

data/lib/kuber_kit/shell/commands/docker_compose_commands.rb

@@ -8,7 +8,7 @@ class KuberKit::Shell::Commands::DockerComposeCommands
     
 
     command_parts << "-d" if detached
-    command_parts << args if args
+    command_parts << Array(args).join(" ") if args
     command_parts << service
     command_parts << command if command
     

data/lib/kuber_kit/shell/local_shell.rb

@@ -2,16 +2,16 @@ require 'fileutils'
 
 class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
   include KuberKit::Import[
-    "tools.logger",
     "shell.command_counter",
     "shell.rsync_commands",
+    "ui",
   ]
 
   def exec!(command, log_command: true)
     command_number = command_counter.get_number.to_s.rjust(2, "0")
     
     if log_command
-      logger.info("Execute: [#{command_number}]: #{command.to_s.cyan}")
+      ui.print_debug("LocalShell", "Execute: [#{command_number}]: #{command.to_s.cyan}")
     end
 
     result = nil
@@ -20,7 +20,7 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
     end
 
     if result && result != "" && log_command
-      logger.info("Finished [#{command_number}] with result: \n#{result.grey}")
+      ui.print_debug("LocalShell", "Finished [#{command_number}] with result: \n  ----\n#{result.grey}\n  ----")
     end
 
     if $?.exitstatus != 0
@@ -34,7 +34,7 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
     command_number = command_counter.get_number.to_s.rjust(2, "0")
     
     if log_command
-      logger.info("Interactive: [#{command_number}]: #{command.to_s.cyan}")
+      ui.print_debug("LocalShell", "Interactive: [#{command_number}]: #{command.to_s.cyan}")
     end
 
     result = system(command)
@@ -57,7 +57,7 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
 
     File.write(file_path, content)
 
-    logger.info("Created file #{file_path.to_s.cyan}\r\n#{content.grey}")
+    ui.print_debug("LocalShell", "Created file #{file_path.to_s.cyan}\r\n  ----\r\n#{content.grey}\r\n  ----")
 
     true
   end
@@ -76,7 +76,7 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
 
   def recursive_list_files(path, name: nil)
     command = %Q{find -L #{path}  -type f}
-    command += " -name #{name}" if name
+    command += " -name '#{name}'" if name
     exec!(command).split(/[\r\n]+/)
   rescue => e
     if e.message.include?("No such file or directory")