kuber_kit 0.2.7 → 0.3.2

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

@@ -0,0 +1,24 @@
+class KuberKit::ServiceDeployer::Strategies::DockerCompose < KuberKit::ServiceDeployer::Strategies::Abstract
+  include KuberKit::Import[
+    "service_reader.reader",
+    "shell.docker_compose_commands",
+    "configs",
+  ]
+
+  Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service => Any
+  def deploy(shell, service)
+    service_config = reader.read(shell, service)
+    config_path    = "#{configs.service_config_dir}/#{service.name}.yml"
+    shell.write(config_path, service_config)
+
+    deployer_service_name = service.attribute(:deployer_service_name, default: service.name.to_s)
+    deployer_command_name = service.attribute(:deployer_command_name, default: "bash")
+    deployer_interactive  = service.attribute(:deployer_interactive, default: false)
+
+    docker_compose_commands.run(shell, config_path, 
+      service:      deployer_service_name, 
+      command:      deployer_command_name,
+      interactive:  deployer_interactive
+    )
+  end
+end

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

@@ -12,14 +12,14 @@ class KuberKit::ServiceDeployer::Strategies::Kubernetes < KuberKit::ServiceDeplo
     shell.write(config_path, service_config)
 
     kubeconfig_path  = KuberKit.current_configuration.kubeconfig_path
-    deploy_namespace = KuberKit.current_configuration.deploy_namespace
+    deployer_namespace = KuberKit.current_configuration.deployer_namespace
 
-    kubectl_commands.apply_file(shell, config_path, kubeconfig_path: kubeconfig_path, namespace: deploy_namespace)
+    kubectl_commands.apply_file(shell, config_path, kubeconfig_path: kubeconfig_path, namespace: deployer_namespace)
 
-    deployment_restart_enabled = service.attribute(:deployment_restart_enabled, default: true)
-    deployment_restart_name    = service.attribute(:deployment_restart_name, default: service.uri)
-    if deployment_restart_enabled
-      kubectl_commands.rolling_restart(shell, deployment_restart_name, kubeconfig_path: kubeconfig_path, namespace: deploy_namespace)
+    deployer_restart_enabled = service.attribute(:deployer_restart_enabled, default: true)
+    deployer_restart_name    = service.attribute(:deployer_restart_name, default: service.uri)
+    if deployer_restart_enabled
+      kubectl_commands.rolling_restart(shell, deployer_restart_name, kubeconfig_path: kubeconfig_path, namespace: deployer_namespace)
     end
   end
 end

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

@@ -12,17 +12,17 @@ class KuberKit::ServiceDeployer::Strategies::KubernetesRunner < KuberKit::Servic
     shell.write(config_path, service_config)
 
     kubeconfig_path  = KuberKit.current_configuration.kubeconfig_path
-    deploy_namespace = KuberKit.current_configuration.deploy_namespace
+    deployer_namespace = KuberKit.current_configuration.deployer_namespace
 
-    deployment_resource_name  = service.attribute(:deployment_resource_name, default: service.uri)
-    deployment_resource_type  = service.attribute(:deployment_resource_type, default: "job")
+    deployer_resource_name  = service.attribute(:deployer_resource_name, default: service.uri)
+    deployer_resource_type  = service.attribute(:deployer_resource_type, default: "job")
 
-    deployment_delete_enabled = service.attribute(:deployment_delete_enabled, default: true)
-    if deployment_delete_enabled
-      delete_resource_if_exists(shell, deployment_resource_type, deployment_resource_name, kubeconfig_path: kubeconfig_path, namespace: deploy_namespace)
+    deployer_delete_enabled = service.attribute(:deployer_delete_enabled, default: true)
+    if deployer_delete_enabled
+      delete_resource_if_exists(shell, deployer_resource_type, deployer_resource_name, kubeconfig_path: kubeconfig_path, namespace: deployer_namespace)
     end
 
-    kubectl_commands.apply_file(shell, config_path, kubeconfig_path: kubeconfig_path, namespace: deploy_namespace)
+    kubectl_commands.apply_file(shell, config_path, kubeconfig_path: kubeconfig_path, namespace: deployer_namespace)
   end
 
   private

data/lib/kuber_kit/service_deployer/strategy_detector.rb

@@ -1,6 +1,6 @@
 class KuberKit::ServiceDeployer::StrategyDetector
   Contract KuberKit::Core::Service => Symbol
   def call(service)
-    service.deploy_strategy || KuberKit.current_configuration.deploy_strategy
+    service.deployer_strategy || KuberKit.current_configuration.deployer_strategy
   end
 end

data/lib/kuber_kit/shell/abstract_shell.rb

@@ -6,6 +6,10 @@ class KuberKit::Shell::AbstractShell
     raise KuberKit::NotImplementedError, "must be implemented"
   end
 
+  def interactive!(command)
+    raise KuberKit::NotImplementedError, "must be implemented"
+  end
+
   def read(file_path)
     raise KuberKit::NotImplementedError, "must be implemented"
   end

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

@@ -13,4 +13,18 @@ class KuberKit::Shell::Commands::DockerCommands
   def push(shell, tag_name)
     shell.exec!(%Q{docker push #{tag_name}})
   end
+
+  def get_container_id(shell, container_name, only_healthy: false, status: "running")
+    command_parts = []
+    command_parts << "docker ps -a -q"
+
+    if only_healthy
+      command_parts << "--filter=\"health=healthy\""
+    end
+
+    command_parts << "--filter=\"status=#{status}\""
+    command_parts << "--filter=\"name=#{container_name}\""
+
+    shell.exec!(command_parts.join(" "))
+  end
 end

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

@@ -0,0 +1,17 @@
+class KuberKit::Shell::Commands::DockerComposeCommands
+  def run(shell, path, service:, command:, interactive: false)
+    command_parts = [
+      "docker-compose",
+      "-f #{path}",
+      "run",
+      service,
+      command
+    ]
+    
+    if interactive
+      shell.interactive!(command_parts.join(" "))
+    else
+      shell.exec!(command_parts.join(" "))
+    end
+  end
+end

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

@@ -16,9 +16,8 @@ class KuberKit::Shell::Commands::KubectlCommands
 
     command_parts += Array(command_list)
 
-    # TODO: investigate how to do it with shell.
     if interactive
-      system(command_parts.join(" "))
+      shell.interactive!(command_parts.join(" "))
     else
       shell.exec!(command_parts.join(" "))
     end
@@ -58,8 +57,8 @@ class KuberKit::Shell::Commands::KubectlCommands
     kubectl_run(shell, command, kubeconfig_path: kubeconfig_path, namespace: namespace)
   end
 
-  def rolling_restart(shell, deployment_name, kubeconfig_path: nil, namespace: nil)
-    patch_deployment(shell, deployment_name, {
+  def rolling_restart(shell, deployer_name, kubeconfig_path: nil, namespace: nil)
+    patch_deployment(shell, deployer_name, {
       spec: {
         template: {
           metadata: {
@@ -72,10 +71,10 @@ class KuberKit::Shell::Commands::KubectlCommands
     }, kubeconfig_path: kubeconfig_path, namespace: namespace)
   end
 
-  def patch_deployment(shell, deployment_name, specs, kubeconfig_path: nil, namespace: nil)
+  def patch_deployment(shell, deployer_name, specs, kubeconfig_path: nil, namespace: nil)
     specs_json = JSON.dump(specs).gsub('"', '\"')
 
-    command = %Q{patch deployment #{deployment_name} -p "#{specs_json}"}
+    command = %Q{patch deployment #{deployer_name} -p "#{specs_json}"}
 
     kubectl_run(shell, command, kubeconfig_path: kubeconfig_path, namespace: namespace)
   end

data/lib/kuber_kit/shell/local_shell.rb

@@ -30,6 +30,20 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
     result
   end
 
+  def interactive!(command, log_command: true)
+    command_number = command_counter.get_number.to_s.rjust(2, "0")
+    
+    if log_command
+      logger.info("Interactive: [#{command_number}]: #{command.to_s.cyan}")
+    end
+
+    result = system(command)
+
+    if !$?.success?
+      raise ShellError, "Shell command failed: #{command}\r\n#{result}"
+    end
+  end
+
   def sync(local_path, remote_path, exclude: nil, delete: true)
     rsync_commands.rsync(self, local_path, remote_path, exclude: exclude, delete: delete)
   end

data/lib/kuber_kit/shell/ssh_shell.rb

@@ -38,6 +38,10 @@ class KuberKit::Shell::SshShell < KuberKit::Shell::LocalShell
     raise ShellError.new(e.message)
   end
 
+  def interactive!(command, log_command: true)
+    raise "Currently interactive run is not supported for ssh shell."
+  end
+
   def sync(local_path, remote_path, exclude: nil, delete: true)
     rsync_commands.rsync(
       local_shell, local_path, remote_path, 

data/lib/kuber_kit/template_reader/action_handler.rb

@@ -0,0 +1,13 @@
+class KuberKit::TemplateReader::ActionHandler
+  include KuberKit::Import[
+    "template_reader.reader",
+    "core.template_store",
+  ]
+
+  Contract KuberKit::Shell::AbstractShell, Symbol => Any
+  def call(shell, template_name)
+    template = template_store.get(template_name)
+
+    reader.read(shell, template)
+  end
+end

data/lib/kuber_kit/template_reader/reader.rb

@@ -2,22 +2,25 @@ class KuberKit::TemplateReader::Reader
   ReaderNotFoundError = Class.new(KuberKit::NotFoundError)
 
   include KuberKit::Import[
-    "template_reader.artifact_file_reader",
+    "template_reader.strategies.artifact_file",
   ]
 
+  def initialize(**injected_deps)
+    super(injected_deps)
+    add_default_strategies
+  end
+
   def use_reader(template_reader, template_class:)
     @@readers ||= {}
 
-    if !template_reader.is_a?(KuberKit::TemplateReader::AbstractTemplateReader)
-      raise ArgumentError.new("should be an instance of KuberKit::TemplateReader::AbstractTemplateReader, got: #{template_reader.inspect}")
+    if !template_reader.is_a?(KuberKit::TemplateReader::Strategies::Abstract)
+      raise ArgumentError.new("should be an instance of KuberKit::TemplateReader::Strategies::Abstract, got: #{template_reader.inspect}")
     end
 
     @@readers[template_class] = template_reader
   end
 
   def read(shell, template)
-    add_default_readers
-
     reader = @@readers[template.class]
 
     raise ReaderNotFoundError, "Can't find reader for template #{template}" if reader.nil?
@@ -25,11 +28,12 @@ class KuberKit::TemplateReader::Reader
     reader.read(shell, template)
   end
 
-  def add_default_readers
-    use_reader(artifact_file_reader, template_class: KuberKit::Core::Templates::ArtifactFile)
-  end
-
   def reset!
     @@readers = {}
   end
+
+  private
+    def add_default_strategies
+      use_reader(artifact_file, template_class: KuberKit::Core::Templates::ArtifactFile)
+    end
 end

data/lib/kuber_kit/template_reader/{abstract_template_reader.rb → strategies/abstract.rb}

@@ -1,4 +1,4 @@
-class KuberKit::TemplateReader::AbstractTemplateReader
+class KuberKit::TemplateReader::Strategies::Abstract
   def read(shell, template)
     raise KuberKit::NotImplementedError, "must be implemented"
   end

data/lib/kuber_kit/template_reader/{artifact_file_reader.rb → strategies/artifact_file.rb}

@@ -1,4 +1,4 @@
-class KuberKit::TemplateReader::ArtifactFileReader < KuberKit::TemplateReader::AbstractTemplateReader
+class KuberKit::TemplateReader::Strategies::ArtifactFile < KuberKit::TemplateReader::Strategies::Abstract
   include KuberKit::Import[
     "core.artifact_store"
   ]

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.2.7"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.2
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -158,10 +158,12 @@ files:
 - TODO.md
 - bin/console
 - bin/kit
+- example/app_data/docker_compose.yml
 - example/app_data/env_file.yml
 - example/app_data/service.yml
 - example/app_data/test.env
 - example/app_data/test.txt
+- example/config.rb
 - example/configurations/review.rb
 - example/images/app_sources/Dockerfile
 - example/images/app_sources/build_context/source.rb
@@ -179,6 +181,7 @@ files:
 - example/infrastructure/env_files.rb
 - example/infrastructure/registries.rb
 - example/infrastructure/templates.rb
+- example/services/compose_app.rb
 - example/services/env_file.rb
 - example/services/ruby_app.rb
 - kuber_kit.gemspec
@@ -212,6 +215,7 @@ files:
 - lib/kuber_kit/core/configuration_store.rb
 - lib/kuber_kit/core/context_helper/base_helper.rb
 - lib/kuber_kit/core/context_helper/context_helper_factory.rb
+- lib/kuber_kit/core/context_helper/context_vars.rb
 - lib/kuber_kit/core/context_helper/image_helper.rb
 - lib/kuber_kit/core/context_helper/service_helper.rb
 - lib/kuber_kit/core/env_files/abstract_env_file.rb
@@ -256,6 +260,7 @@ files:
 - lib/kuber_kit/service_deployer/deployer.rb
 - lib/kuber_kit/service_deployer/service_list_resolver.rb
 - lib/kuber_kit/service_deployer/strategies/abstract.rb
+- lib/kuber_kit/service_deployer/strategies/docker_compose.rb
 - lib/kuber_kit/service_deployer/strategies/kubernetes.rb
 - lib/kuber_kit/service_deployer/strategies/kubernetes_runner.rb
 - lib/kuber_kit/service_deployer/strategy_detector.rb
@@ -265,15 +270,17 @@ files:
 - lib/kuber_kit/shell/command_counter.rb
 - lib/kuber_kit/shell/commands/bash_commands.rb
 - lib/kuber_kit/shell/commands/docker_commands.rb
+- lib/kuber_kit/shell/commands/docker_compose_commands.rb
 - lib/kuber_kit/shell/commands/git_commands.rb
 - lib/kuber_kit/shell/commands/kubectl_commands.rb
 - lib/kuber_kit/shell/commands/rsync_commands.rb
 - lib/kuber_kit/shell/local_shell.rb
 - lib/kuber_kit/shell/ssh_session.rb
 - lib/kuber_kit/shell/ssh_shell.rb
-- lib/kuber_kit/template_reader/abstract_template_reader.rb
-- lib/kuber_kit/template_reader/artifact_file_reader.rb
+- lib/kuber_kit/template_reader/action_handler.rb
 - lib/kuber_kit/template_reader/reader.rb
+- lib/kuber_kit/template_reader/strategies/abstract.rb
+- lib/kuber_kit/template_reader/strategies/artifact_file.rb
 - lib/kuber_kit/tools/file_presence_checker.rb
 - lib/kuber_kit/tools/logger_factory.rb
 - lib/kuber_kit/ui.rb