kuber_kit 0.1.4 → 0.1.9

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

@@ -15,12 +15,18 @@ 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)
-
-    logger = KuberKit::Container['tools.logger']
-    logger.info("---------------------------")
-    logger.info("Image compilation finished!")
-    logger.info("---------------------------")
+    result = KuberKit::Container['actions.image_compiler'].call(image_names, options)
+
+    if result
+      logger = KuberKit::Container['tools.logger']
+      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 "env ENV_FILE_NAME", "Return content of Env File ENV_FILE_NAME"

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

@@ -69,18 +69,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 +106,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 +141,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 +181,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 +201,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 +221,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

data/lib/kuber_kit/core/build_servers/abstract_build_server.rb

@@ -0,0 +1,21 @@
+class KuberKit::Core::BuildServers::AbstractBuildServer
+  include KuberKit::Extensions::Inspectable
+
+  attr_reader :name
+
+  def initialize(build_server_name)
+    @name = build_server_name
+  end
+
+  def host
+    raise KuberKit::NotImplementedError, "must be implemented"
+  end
+
+  def user
+    raise KuberKit::NotImplementedError, "must be implemented"
+  end
+
+  def port
+    raise KuberKit::NotImplementedError, "must be implemented"
+  end
+end

data/lib/kuber_kit/core/build_servers/build_server.rb

@@ -0,0 +1,24 @@
+class KuberKit::Core::BuildServers::BuildServer < KuberKit::Core::BuildServers::AbstractBuildServer
+  def setup(host:, user:, port:)
+    @host = host
+    @user = user
+    @port = port
+
+    self
+  end
+
+  def host
+    raise ArgumentError, "host is not set, please use #setup method" if @host.nil?
+    @host
+  end
+
+  def user
+    raise ArgumentError, "user is not set, please use #setup method" if @user.nil?
+    @user
+  end
+
+  def port
+    raise ArgumentError, "port is not set, please use #setup method" if @port.nil?
+    @port
+  end
+end

data/lib/kuber_kit/core/build_servers/build_server_store.rb

@@ -0,0 +1,18 @@
+class KuberKit::Core::BuildServers::BuildServerStore
+  def add(build_server)
+    store.add(build_server.name, build_server)
+  end
+
+  def get(build_server_name)
+    store.get(build_server_name)
+  end
+
+  def reset!
+    store.reset!
+  end
+
+  private
+    def store
+      @@store ||= KuberKit::Core::Store.new(KuberKit::Core::BuildServers::AbstractBuildServer)
+    end
+end

data/lib/kuber_kit/core/configuration.rb

@@ -1,5 +1,6 @@
 class KuberKit::Core::Configuration
-  attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubeconfig_path, :deploy_strategy
+  attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubeconfig_path, 
+              :deploy_strategy, :services_attributes, :build_servers
 
   Contract KeywordArgs[
     name:            Symbol,
@@ -7,10 +8,13 @@ class KuberKit::Core::Configuration
     registries:      Hash,
     env_files:       Hash,
     templates:       Hash,
-    kubeconfig_path:    Maybe[String],
-    deploy_strategy: Symbol
+    kubeconfig_path: Maybe[String],
+    deploy_strategy: Symbol,
+    services_attributes: HashOf[Symbol => Hash],
+    build_servers:   ArrayOf[KuberKit::Core::BuildServers::AbstractBuildServer]
   ] => Any
-  def initialize(name:, artifacts:, registries:, env_files:, templates:, kubeconfig_path:, deploy_strategy:)
+  def initialize(name:, artifacts:, registries:, env_files:, templates:, kubeconfig_path:, 
+                 deploy_strategy:, services_attributes:, build_servers:)
     @name             = name
     @artifacts        = artifacts
     @registries       = registries
@@ -18,5 +22,11 @@ class KuberKit::Core::Configuration
     @templates        = templates
     @kubeconfig_path  = kubeconfig_path
     @deploy_strategy  = deploy_strategy
+    @services_attributes = services_attributes
+    @build_servers    = build_servers
+  end
+
+  def service_attributes(service_name)
+    services_attributes[service_name.to_sym] || {}
   end
 end

data/lib/kuber_kit/core/configuration_definition.rb

@@ -10,6 +10,9 @@ class KuberKit::Core::ConfigurationDefinition
     @registries = {}
     @env_files  = {}
     @templates  = {}
+    @build_servers      = []
+    @enabled_services   = []
+    @services_attributes = {}
   end
 
   def to_attrs
@@ -20,7 +23,10 @@ class KuberKit::Core::ConfigurationDefinition
       env_files:        @env_files,
       templates:        @templates,
       kubeconfig_path:  @kubeconfig_path,
-      deploy_strategy:  @deploy_strategy
+      deploy_strategy:  @deploy_strategy,
+      enabled_services: @enabled_services,
+      build_servers:    @build_servers,
+      services_attributes: @services_attributes
     )
   end
 
@@ -60,6 +66,14 @@ class KuberKit::Core::ConfigurationDefinition
     self
   end
 
+  def use_build_server(build_server_name)
+    unless @build_servers.include?(build_server_name)
+      @build_servers.push(build_server_name)
+    end
+
+    self
+  end
+
   def kubeconfig_path(path)
     @kubeconfig_path = path
 
@@ -71,4 +85,11 @@ class KuberKit::Core::ConfigurationDefinition
 
     self
   end
+
+  def enabled_services(services_hash)
+    @enabled_services += services_hash.keys.map(&:to_sym)
+    @services_attributes = @services_attributes.merge(services_hash)
+
+    self
+  end
 end