kuber_kit 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3088efcb997e3dda2dbcd85d584265b7a5eec03b20093265842e3396592ab35
-  data.tar.gz: a52e92d808c31b2a0f654e8ba2eaa9cf46a0b7352855f7602e63fee7a09a1271
+  metadata.gz: 339883bd875277f494fdef1fe01035920e6a867ea98394e10c4d08e5a8b5a108
+  data.tar.gz: 96448b7bb059d60e55ec0b8bceb70e1a02b8740773dcdbc4944afa3fafda3192
 SHA512:
-  metadata.gz: 5ab6df03558b78d0d146cd6d77224f048564ae8d84c9c6d18d2b9abddb6d6cd8c1e8306549bad16c254fd5632b83c2cfceb690518216251efc4008983aa31f86
-  data.tar.gz: 1a2837bfa4334e33fa3c7aee7274516c297e9df0b92adf0fd7f021576c3682af2b48f9336c80b849bf1c5655a88f4d3cf43a42f6669140f5875e99a6710b5a5e
+  metadata.gz: 49b5bf9c115c06ab88f67b60bc54f55b254a3a1a4de58ebe0fa834c04b352d8e759ed66747bd98e1d62a8adbb794cbda948dbd324c06165113af29d28ce02aad
+  data.tar.gz: 77354cf127ad50ff4f5f092aeaebfdb7568030ea8120e990dc01eb109a9ca679da83f1124cd5df225d37053ce2abe84d4e9016c0d284b47a323a4d175ba28b40

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.3.1)
+    kuber_kit (0.3.2)
       cli-ui
       contracts-lite
       dry-auto_inject

data/example/app_data/docker_compose.yml

@@ -0,0 +1,6 @@
+version: "3.3"
+services:
+  <%= service_name %>:
+    container_name: <%= service_name %>
+    hostname: <%= service_name %>
+    image: <%= image_url(attribute(:image_name, default: service_name.to_sym)) %>

data/example/configurations/review.rb

@@ -2,4 +2,4 @@ KuberKit
   .define_configuration(:review)
   .use_registry(:review_default, as: :default)
   .use_artifact(:kuber_kit_repo, as: :kuber_kit_repo)
-  .use_build_server(:remote_bs)
+  #.use_build_server(:remote_bs)

data/example/infrastructure/build_servers.rb

@@ -1,8 +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)
-)
+# 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/infrastructure/templates.rb

@@ -6,4 +6,9 @@ KuberKit.add_template(
 KuberKit.add_template(
   KuberKit::Core::Templates::ArtifactFile
     .new(:env_file, artifact_name: :kuber_kit_example_data, file_path: "env_file.yml")
+)
+
+KuberKit.add_template(
+  KuberKit::Core::Templates::ArtifactFile
+    .new(:docker_compose, artifact_name: :kuber_kit_example_data, file_path: "docker_compose.yml")
 )

data/example/services/compose_app.rb

@@ -0,0 +1,10 @@
+KuberKit
+  .define_service(:compose_app)
+  .template(:docker_compose)
+  .images(:ruby_app)
+  .tags(:compose)
+  .deployer_strategy(:docker_compose)
+  .attributes(
+    image_name: :ruby_app,
+    deployer_interactive: true
+  )

data/example/services/env_file.rb

@@ -3,5 +3,5 @@ KuberKit
   .template(:env_file)
   .tags("env_file")
   .attributes(
-    deployment_restart_enabled: false
+    deployer_restart_enabled: false
   )

data/lib/kuber_kit.rb

@@ -211,6 +211,10 @@ module KuberKit
       !!@debug_mode
     end
 
+    def deprecation_warnings_disabled?
+      Container["configs"].deprecation_warnings_disabled
+    end
+
     def current_configuration
       if @configuration_name.nil?
         raise "Please set configuration name before calling current_configuration"

data/lib/kuber_kit/actions/kubectl_applier.rb

@@ -8,9 +8,9 @@ class KuberKit::Actions::KubectlApplier
   Contract String, Hash => Any
   def call(file_path, options)
     kubeconfig_path  = KuberKit.current_configuration.kubeconfig_path
-    deploy_namespace = KuberKit.current_configuration.deploy_namespace
+    deployer_namespace = KuberKit.current_configuration.deployer_namespace
     ui.create_task("Applying file: #{file_path}") do |task|
-      kubectl_commands.apply_file(local_shell, file_path, kubeconfig_path: kubeconfig_path, namespace: deploy_namespace)
+      kubectl_commands.apply_file(local_shell, file_path, kubeconfig_path: kubeconfig_path, namespace: deployer_namespace)
       task.update_title("Applied file: #{file_path}")
     end
 

data/lib/kuber_kit/actions/kubectl_attacher.rb

@@ -8,13 +8,13 @@ class KuberKit::Actions::KubectlAttacher
   Contract String, Hash => Any
   def call(pod_name, options)
     kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
-    deploy_namespace = KuberKit.current_configuration.deploy_namespace
+    deployer_namespace = KuberKit.current_configuration.deployer_namespace
 
     kubectl_commands.exec(
       local_shell, pod_name, "bash", args: "-it", 
       kubeconfig_path: kubeconfig_path, 
       interactive: true,
-      namespace: deploy_namespace
+      namespace: deployer_namespace
     )
 
     true

data/lib/kuber_kit/configs.rb

@@ -4,8 +4,8 @@ class KuberKit::Configs
   AVAILABLE_CONFIGS = [
     :image_dockerfile_name, :image_build_context_dir, :image_tag, :docker_ignore_list, :image_compile_dir, 
     :kuber_kit_dirname, :kuber_kit_min_version, :images_dirname, :services_dirname, :infra_dirname, :configurations_dirname,
-    :artifact_clone_dir, :service_config_dir, :deploy_strategy, :compile_simultaneous_limit,
-    :additional_images_paths
+    :artifact_clone_dir, :service_config_dir, :deployer_strategy, :compile_simultaneous_limit,
+    :additional_images_paths, :deprecation_warnings_disabled
   ]
   DOCKER_IGNORE_LIST = [
     'Dockerfile',
@@ -47,9 +47,10 @@ class KuberKit::Configs
     set :configurations_dirname,  "configurations"
     set :artifact_clone_dir,      "/tmp/kuber_kit/artifacts"
     set :service_config_dir,      "/tmp/kuber_kit/services"
-    set :deploy_strategy,         :kubernetes
+    set :deployer_strategy,         :kubernetes
     set :compile_simultaneous_limit, 5
     set :additional_images_paths, []
+    set :deprecation_warnings_disabled, false
   end
 
   def items

data/lib/kuber_kit/core/configuration.rb

@@ -1,6 +1,6 @@
 class KuberKit::Core::Configuration
   attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubeconfig_path, 
-              :deploy_strategy, :deploy_namespace, :services_attributes, :build_servers,
+              :deployer_strategy, :deployer_namespace, :services_attributes, :build_servers,
               :global_build_vars
 
   Contract KeywordArgs[
@@ -10,14 +10,14 @@ class KuberKit::Core::Configuration
     env_files:       Hash,
     templates:       Hash,
     kubeconfig_path: Maybe[String],
-    deploy_strategy:  Symbol,
-    deploy_namespace: Maybe[Symbol],
+    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],
   ] => Any
   def initialize(name:, artifacts:, registries:, env_files:, templates:, kubeconfig_path:, 
-                 deploy_strategy:, deploy_namespace:, services_attributes:, build_servers:, 
+                 deployer_strategy:, deployer_namespace:, services_attributes:, build_servers:, 
                  global_build_vars:)
     @name             = name
     @artifacts        = artifacts
@@ -25,8 +25,8 @@ class KuberKit::Core::Configuration
     @env_files        = env_files
     @templates        = templates
     @kubeconfig_path  = kubeconfig_path
-    @deploy_strategy  = deploy_strategy
-    @deploy_namespace = deploy_namespace
+    @deployer_strategy  = deployer_strategy
+    @deployer_namespace = deployer_namespace
     @build_servers    = build_servers
     @services_attributes  = services_attributes
     @global_build_vars    = global_build_vars
@@ -37,7 +37,9 @@ class KuberKit::Core::Configuration
   end
 
   def global_build_args
-    puts "WARNING: global_build_args is deprecated, please use global_build_vars instead"
+    unless KuberKit.deprecation_warnings_disabled?
+      puts "DEPRECATION: global_build_args is deprecated, please use global_build_vars instead"
+    end
     global_build_vars
   end
 end

data/lib/kuber_kit/core/configuration_definition.rb

@@ -23,8 +23,8 @@ class KuberKit::Core::ConfigurationDefinition
       env_files:        @env_files,
       templates:        @templates,
       kubeconfig_path:  @kubeconfig_path,
-      deploy_strategy:  @deploy_strategy,
-      deploy_namespace: @deploy_namespace,
+      deployer_strategy:  @deployer_strategy,
+      deployer_namespace: @deployer_namespace,
       enabled_services: @enabled_services,
       build_servers:    @build_servers,
       services_attributes:  @services_attributes,
@@ -82,14 +82,14 @@ class KuberKit::Core::ConfigurationDefinition
     self
   end
 
-  def deploy_namespace(namespace)
-    @deploy_namespace = namespace
+  def deployer_namespace(namespace)
+    @deployer_namespace = namespace
 
     self
   end
 
-  def deploy_strategy(path)
-    @deploy_strategy = path
+  def deployer_strategy(path)
+    @deployer_strategy = path
 
     self
   end

data/lib/kuber_kit/core/configuration_factory.rb

@@ -20,15 +20,15 @@ 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,
-      deploy_strategy:  configuration_attrs.deploy_strategy || configs.deploy_strategy,
-      deploy_namespace: configuration_attrs.deploy_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,
+      deployer_strategy:  configuration_attrs.deployer_strategy || configs.deployer_strategy,
+      deployer_namespace: configuration_attrs.deployer_namespace,
+      build_servers:      build_servers,
       services_attributes:  configuration_attrs.services_attributes,
       global_build_vars:    configuration_attrs.global_build_vars || {},
     )

data/lib/kuber_kit/core/image.rb

@@ -33,7 +33,9 @@ class KuberKit::Core::Image
   end
 
   def build_args
-    puts "WARNING: build_args is deprecated, please use build_vars instead"
+    unless KuberKit.deprecation_warnings_disabled?
+      puts "WARNING: build_args is deprecated, please use build_vars instead"
+    end
     build_vars
   end
 end

data/lib/kuber_kit/core/image_definition.rb

@@ -44,7 +44,9 @@ class KuberKit::Core::ImageDefinition
   end
 
   def build_args(value = nil, &block)
-    puts "WARNING: build_args is deprecated, please use build_vars instead"
+    unless KuberKit.deprecation_warnings_disabled?
+      puts "WARNING: build_args is deprecated, please use build_vars instead"
+    end
     build_vars(value, *block)
   end
 

data/lib/kuber_kit/core/service.rb

@@ -1,7 +1,7 @@
 class KuberKit::Core::Service
   AttributeNotSet = Class.new(Indocker::Error)
 
-  attr_reader :name, :template_name, :tags, :images, :attributes, :deploy_strategy
+  attr_reader :name, :template_name, :tags, :images, :attributes, :deployer_strategy
 
   Contract KeywordArgs[
     name:             Symbol,
@@ -9,15 +9,15 @@ class KuberKit::Core::Service
     tags:             ArrayOf[Symbol],
     images:           ArrayOf[Symbol],
     attributes:       HashOf[Symbol => Any],
-    deploy_strategy:  Maybe[Symbol]
+    deployer_strategy:  Maybe[Symbol]
   ] => Any
-  def initialize(name:, template_name:, tags:, images:, attributes:, deploy_strategy:)
+  def initialize(name:, template_name:, tags:, images:, attributes:, deployer_strategy:)
     @name = name
     @template_name = template_name
     @tags = tags
     @images = images
     @attributes = attributes
-    @deploy_strategy = deploy_strategy
+    @deployer_strategy = deployer_strategy
   end
 
   def uri

data/lib/kuber_kit/core/service_definition.rb

@@ -13,7 +13,7 @@ class KuberKit::Core::ServiceDefinition
       tags:             Array(get_value(@tags)).map(&:to_sym),
       images:           Array(get_value(@images)).map(&:to_sym),
       attributes:       get_value(@attributes),
-      deploy_strategy:  get_value(@deploy_strategy),
+      deployer_strategy:  get_value(@deployer_strategy),
     )
   end
 
@@ -41,8 +41,8 @@ class KuberKit::Core::ServiceDefinition
     self
   end
 
-  def deploy_strategy(value = nil, &block)
-    @deploy_strategy = block_given? ? block : value
+  def deployer_strategy(value = nil, &block)
+    @deployer_strategy = block_given? ? block : value
 
     self
   end

data/lib/kuber_kit/core/service_factory.rb

@@ -12,12 +12,12 @@ class KuberKit::Core::ServiceFactory
     attributes = (service_attrs.attributes || {}).merge(configuration_attributes)
 
     KuberKit::Core::Service.new(
-      name:             service_attrs.name,
-      template_name:    service_attrs.template_name,
-      tags:             service_attrs.tags,
-      images:           service_attrs.images,
-      attributes:       attributes,
-      deploy_strategy:  service_attrs.deploy_strategy,
+      name:               service_attrs.name,
+      template_name:      service_attrs.template_name,
+      tags:               service_attrs.tags,
+      images:             service_attrs.images,
+      attributes:         attributes,
+      deployer_strategy:  service_attrs.deployer_strategy,
     )
   end
 end

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

@@ -11,14 +11,14 @@ class KuberKit::ServiceDeployer::Strategies::DockerCompose < KuberKit::ServiceDe
     config_path    = "#{configs.service_config_dir}/#{service.name}.yml"
     shell.write(config_path, service_config)
 
-    deployment_service_name = service.attribute(:deployment_service_name, default: service.name.to_s)
-    deployment_command_name = service.attribute(:deployment_command_name, default: "bash")
-    deployment_interactive  = service.attribute(:deployment_interactive, default: false)
+    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:      deployment_service_name, 
-      command:      deployment_command_name,
-      interactive:  deployment_interactive
+      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/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/kubectl_commands.rb

@@ -57,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: {
@@ -71,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

@@ -37,7 +37,11 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
       logger.info("Interactive: [#{command_number}]: #{command.to_s.cyan}")
     end
 
-    system(command)
+    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)

data/lib/kuber_kit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Iskander Khaziev
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -158,6 +158,7 @@ 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
@@ -180,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
@@ -289,7 +291,7 @@ homepage: https://github.com/ArtStation/kuber_kit
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -305,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Docker Containers Build & Deployment
 test_files: []