kuber_kit 0.5.1 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e92d48eb25df0740824ac18623687080cc2ae9336b6707057ad2be4d8b2c4dad
-  data.tar.gz: 629b8c6f11674623d3348c390a5bc90776cc3844d45418bbc7311a268aa3fd1f
+  metadata.gz: 185201d6f305a1e69b2d5ec982288234454404bb9b87501130f159fb58a3b97a
+  data.tar.gz: e411255031c65afe38e7b0faa20e9b578b2d3eca93a3bb9dc013766a59c7d2b1
 SHA512:
-  metadata.gz: 44e8c023ad85250859ce0d3029fefe69d285db34604cdfa2c61e4017f01e24c819f68f16397eccd5e89de59aba9ddc6d1b6dcd1d344842716696dce6bbcdee98
-  data.tar.gz: 3d55ac2765022a978f6925ef477a727da2a8db12df383dc13703414fa66b989944c5fc452936a01b5d7ccf696313fae0f067e7507c482b1e45bba53fa0adcfc0
+  metadata.gz: 936fd6032488908db1fffe95f736dd05042c499f2995be2bc28566b2f65d9d5b35150acc0cf08de50442c16408d56d623292bb8e051215bfc15b8aba804266cc
+  data.tar.gz: c81b1a227cf5690d675b0b8d269382f0bb6d13ed71cfc3442679e1bd7471b995e02e7177b6c93bfb6955792bd591708c0ea017f9ea52291992bbbd0e5b33c0e2

data/CHANGELOG.md

@@ -0,0 +1,21 @@
+**0.5.6**
+- Pre-process env file if it has .erb extension
+- Allow attaching env file from configuration to docker container
+- Change default data paths to use home directory
+- Add env groups support to combine multiple env files
+
+**0.5.5**
+- Added ability to skip services during deployment using -S option
+
+**0.5.4**
+- Added disabled services support
+
+**0.5.3**
+- Change the symbol to exclude service from "-" to "!", you can pass "-s !auth_app" to exclude "auth_app"
+- Added kit get command to find pods
+ 
+**0.5.2**
+- Added dependencies support to services
+- Added an option to deploy all services in `kit deloy`
+- Wait for rollout to finish during service deploy
+- Deploy services in batches, not all of the simultaneously

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.5.1)
+    kuber_kit (0.5.6)
       cli-ui
       contracts-lite
       dry-auto_inject
@@ -12,9 +12,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    cli-ui (1.4.0)
+    cli-ui (1.5.1)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     contracts-lite (0.15.0)
     diff-lcs (1.4.4)
     docile (1.3.2)
@@ -26,7 +26,7 @@ GEM
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.5.0)
+    dry-core (0.6.0)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     net-ssh (6.1.0)
@@ -58,7 +58,7 @@ GEM
     thor (1.1.0)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
-    tty-prompt (0.23.0)
+    tty-prompt (0.23.1)
       pastel (~> 0.8)
       tty-reader (~> 0.8)
     tty-reader (0.9.0)

data/TODO.md

@@ -1,8 +1,8 @@
-- do not show result for images list, if list is too large (Mikhail)
-- add kit get method for interactive kubernetes
-- kit status should show the list of services and their status, with ability to select & view logs
-- find a way to always deploy some service, e.g. for migrations and env_files
+- add kit get method for more interactive kubernetes
+- env files should use a separate deployment method (with change detection)
+- add automatical confirmation support for service deployer
 - template should be able to set default attributes
 - template should be able to depend on image?
 - cleanup image builds older than some date
-- add some rotation for deploy log
+- add some rotation for deploy log
+- kit status should show the list of services and their status, with ability to select & view logs

data/example/configurations/review.rb

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

data/example/services/docker_app.rb

@@ -7,6 +7,7 @@ KuberKit
       detached:         false,
       image_name:       :ruby_app,
       container_name:   "test_docker_app",
-      delete_if_exists: true
+      delete_if_exists: true,
+      env_file_names:   [:test]
     }
   )

data/example/services/env_file.rb

@@ -1,7 +1,7 @@
 KuberKit
   .define_service(:env_file)
   .template(:env_file)
-  .tags("env_file")
+  .tags("env_file", "minimal")
   .attributes(
     deployer_restart_enabled: false
   )

data/example/services/ruby_app.rb

@@ -1,5 +1,6 @@
 KuberKit
   .define_service(:ruby_app)
+  .depends_on(:env_file)
   .template(:service)
   .images(:ruby_app)
-  .tags("app")
+  .tags("app", "minimal")

data/lib/kuber_kit.rb

@@ -46,10 +46,15 @@ module KuberKit
       autoload :BuildServer, 'core/build_servers/build_server'
     end
 
+    module Dependencies
+      autoload :AbstractDependencyResolver, 'core/dependencies/abstract_dependency_resolver'
+    end
+
     module EnvFiles
       autoload :EnvFileStore, 'core/env_files/env_file_store'
       autoload :AbstractEnvFile, 'core/env_files/abstract_env_file'
       autoload :ArtifactFile, 'core/env_files/artifact_file'
+      autoload :EnvGroup, 'core/env_files/env_group'
     end
 
     module ContextHelper
@@ -123,10 +128,13 @@ module KuberKit
   module EnvFileReader
     autoload :ActionHandler, 'env_file_reader/action_handler'
     autoload :Reader, 'env_file_reader/reader'
+    autoload :EnvFileParser, 'env_file_reader/env_file_parser'
+    autoload :EnvFileTempfileCreator, 'env_file_reader/env_file_tempfile_creator'
 
     module Strategies
       autoload :Abstract, 'env_file_reader/strategies/abstract'
       autoload :ArtifactFile, 'env_file_reader/strategies/artifact_file'
+      autoload :EnvGroup, 'env_file_reader/strategies/env_group'
     end
   end
 
@@ -145,6 +153,7 @@ module KuberKit
     autoload :StrategyDetector, 'service_deployer/strategy_detector'
     autoload :Deployer, 'service_deployer/deployer'
     autoload :ServiceListResolver, 'service_deployer/service_list_resolver'
+    autoload :ServiceDependencyResolver, 'service_deployer/service_dependency_resolver'
 
     module Strategies
       autoload :Abstract, 'service_deployer/strategies/abstract'
@@ -171,6 +180,7 @@ module KuberKit
     autoload :KubectlAttacher, 'actions/kubectl_attacher'
     autoload :KubectlConsole, 'actions/kubectl_console'
     autoload :KubectlDescribe, 'actions/kubectl_describe'
+    autoload :KubectlGet, 'actions/kubectl_get'
     autoload :KubectlLogs, 'actions/kubectl_logs'
     autoload :KubectlEnv, 'actions/kubectl_env'
   end

data/lib/kuber_kit/actions/kubectl_get.rb

@@ -0,0 +1,32 @@
+class KuberKit::Actions::KubectlGet
+  include KuberKit::Import[
+    "shell.kubectl_commands",
+    "shell.local_shell",
+    "kubernetes.resource_selector",
+    "ui"
+  ]
+
+  Contract Maybe[String], Hash => Any
+  def call(resource_name, options)
+    kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
+    deployer_namespace = KuberKit.current_configuration.deployer_namespace
+
+    resources = kubectl_commands.get_resources(
+      local_shell, "pod",
+      kubeconfig_path: kubeconfig_path, 
+      namespace: deployer_namespace
+    )
+    
+    if resource_name
+      resources = resources.select{|r| r.include?(resource_name) }
+    end
+
+    ui.print_info("Pods", resources.join("\n"))
+
+    true
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+    
+    false
+  end
+end

data/lib/kuber_kit/actions/service_checker.rb

@@ -15,6 +15,11 @@ class KuberKit::Actions::ServiceChecker
       services = services.select{ |s| enabled_services.include?(s) }
     end
 
+    disabled_services  = KuberKit.current_configuration.disabled_services.map(&:to_s)
+    if disabled_services.any?
+      services = services.select{ |s| !disabled_services.include?(s) }
+    end
+
     resources = resources_fetcher.call("deployments") + resources_fetcher.call("cronjobs")
 
     missing_services = services.select{ |s| !resources.include?(s.gsub("_", "-")) }

data/lib/kuber_kit/actions/service_deployer.rb

@@ -2,9 +2,11 @@ class KuberKit::Actions::ServiceDeployer
   include KuberKit::Import[
     "actions.image_compiler",
     "service_deployer.service_list_resolver",
+    "service_deployer.service_dependency_resolver",
     "core.service_store",
     "shell.local_shell",
     "tools.process_cleaner",
+    "configs",
     "ui",
     service_deployer: "service_deployer.action_handler",
   ]
@@ -12,26 +14,37 @@ class KuberKit::Actions::ServiceDeployer
   Contract KeywordArgs[
     services:             Maybe[ArrayOf[String]],
     tags:                 Maybe[ArrayOf[String]],
+    skip_services:        Maybe[ArrayOf[String]],
     skip_compile:         Maybe[Bool],
     require_confirmation: Maybe[Bool],
   ] => Any
-  def call(services:, tags:, skip_compile: false, require_confirmation: false)
+  def call(services:, tags:, skip_services: nil, skip_compile: false, require_confirmation: false)
+    current_configuration = KuberKit.current_configuration
+
     if services.empty? && tags.empty?
       services, tags = show_tags_selection
     end
 
+
+    disabled_services = current_configuration.disabled_services.map(&:to_s)
+    disabled_services += skip_services if skip_services
+
     service_names = service_list_resolver.resolve(
       services:         services || [],
       tags:             tags || [],
-      enabled_services: KuberKit.current_configuration.enabled_services.map(&:to_s)
-    )
+      enabled_services:   current_configuration.enabled_services.map(&:to_s),
+      disabled_services:  disabled_services
+    ).map(&:to_sym)
+
+    # Return the list of services with all dependencies.
+    all_service_names = service_dependency_resolver.get_all(service_names)
 
-    unless service_names.any?
+    unless all_service_names.any?
       ui.print_warning "ServiceDeployer", "No service found with given options, nothing will be deployed."
       return false
     end
 
-    services_list = service_names.map(&:to_s).map(&:yellow).join(", ")
+    services_list = all_service_names.map(&:to_s).map(&:yellow).join(", ")
     ui.print_info "ServiceDeployer", "The following services will be deployed: #{services_list}"
 
     if require_confirmation
@@ -39,7 +52,7 @@ class KuberKit::Actions::ServiceDeployer
       return false unless ["confirm".green, "confirm", "yes"].include?(result)
     end
 
-    services = service_names.map do |service_name|
+    services = all_service_names.map do |service_name|
       service_store.get_service(service_name.to_sym)
     end
 
@@ -50,9 +63,16 @@ class KuberKit::Actions::ServiceDeployer
       return false unless compile_result
     end
 
-    deployment_result = deploy_services(service_names)
+    deployed_services = []
+    deployment_result = {}
+    service_dependency_resolver.each_with_deps(service_names) do |dep_service_names|
+      ui.print_debug("ServiceDeployer", "Scheduling to compile: #{dep_service_names.inspect}. Limit: #{configs.deploy_simultaneous_limit}")
+      result = deploy_simultaneously(dep_service_names)
+      deployed_services += dep_service_names
+      deployment_result = deployment_result.merge(result)
+    end
 
-    { services: service_names, deployment: deployment_result }
+    { services: all_service_names, deployment: deployment_result }
   rescue KuberKit::Error => e
     ui.print_error("Error", e.message)
 
@@ -61,69 +81,73 @@ class KuberKit::Actions::ServiceDeployer
     process_cleaner.clean
   end
 
-  def deploy_services(service_names)
-    task_group = ui.create_task_group
+  private
+    def deploy_simultaneously(service_names)
+      task_group = ui.create_task_group
 
-    deployer_result = {}
+      deployer_result = {}
 
-    service_names.each do |service_name|
+      service_names.each do |service_name|
 
-      ui.print_debug("ServiceDeployer", "Started deploying: #{service_name.to_s.green}")
-      task_group.add("Deploying #{service_name.to_s.yellow}") do |task|
-        deployer_result[service_name] = service_deployer.call(local_shell, service_name.to_sym)
+        ui.print_debug("ServiceDeployer", "Started deploying: #{service_name.to_s.green}")
+        task_group.add("Deploying #{service_name.to_s.yellow}") do |task|
+          deployer_result[service_name] = service_deployer.call(local_shell, service_name.to_sym)
 
-        task.update_title("Deployed #{service_name.to_s.green}")
-        ui.print_debug("ServiceDeployer", "Finished deploying: #{service_name.to_s.green}")
+          task.update_title("Deployed #{service_name.to_s.green}")
+          ui.print_debug("ServiceDeployer", "Finished deploying: #{service_name.to_s.green}")
+        end
       end
-    end
 
-    task_group.wait
-
-    deployer_result
-  end
+      task_group.wait
 
-  def compile_images(images_names)
-    return true if images_names.empty?
-    image_compiler.call(images_names, {})
-  end
+      deployer_result
+    end
 
-  def show_tags_selection()
-    specific_service_option = "deploy specific service"
-
-    tags = [specific_service_option]
-    tags += service_store
-      .all_definitions
-      .values
-      .map(&:to_service_attrs)
-      .map(&:tags)
-      .flatten
-      .uniq
-      .sort
-      .map(&:to_s)
-
-    selected_tag = ui.prompt("Please select which tag to deploy", tags)
-
-    if selected_tag == specific_service_option
-      show_service_selection
-    else
-      [[], [selected_tag]]
+    def compile_images(images_names)
+      return true if images_names.empty?
+      image_compiler.call(images_names, {})
     end
-  end
 
-  def show_service_selection()
-    services = service_store
-      .all_definitions
-      .values
-      .map(&:service_name)
-      .uniq
-      .sort
-      .map(&:to_s)
-
-    if services.empty?
-      return [[], []]
+    def show_tags_selection()
+      specific_service_option = "deploy specific service"
+      all_services_option     = "deploy all services"
+
+      tags = [specific_service_option, all_services_option]
+      tags += service_store
+        .all_definitions
+        .values
+        .map(&:to_service_attrs)
+        .map(&:tags)
+        .flatten
+        .uniq
+        .sort
+        .map(&:to_s)
+
+      selected_tag = ui.prompt("Please select which tag to deploy", tags)
+
+      if selected_tag == specific_service_option
+        show_service_selection
+      elsif selected_tag == all_services_option
+        [["*"], []]
+      else
+        [[], [selected_tag]]
+      end
     end
 
-    selected_service = ui.prompt("Please select which service to deploy", services)
-    [[selected_service], []]
-  end
+    def show_service_selection()
+      services = service_store
+        .all_definitions
+        .values
+        .map(&:service_name)
+        .uniq
+        .sort
+        .map(&:to_s)
+
+      if services.empty?
+        return [[], []]
+      end
+
+      selected_service = ui.prompt("Please select which service to deploy", services)
+      [[selected_service], []]
+    end
 end

data/lib/kuber_kit/cli.rb

@@ -30,9 +30,10 @@ class KuberKit::CLI < Thor
     end
   end
 
-  desc "deploy -t CONTEXT_NAME", "Deploy CONTEXT_NAME with kubectl"
+  desc "deploy -t TAG_NAME", "Deploy CONTEXT_NAME with kubectl"
   method_option :services,              :type => :array,    aliases: ["-s"], repeatable: true
   method_option :tags,                  :type => :array,    aliases: ["-t"], repeatable: true
+  method_option :skip_services,         :type => :array,    aliases: ["-S"], repeatable: true
   method_option :skip_compile,          :type => :boolean,  aliases: ["-B"]
   method_option :require_confirmation,  :type => :boolean,  aliases: ["-r"]
   def deploy
@@ -46,6 +47,7 @@ class KuberKit::CLI < Thor
       result = KuberKit::Container['actions.service_deployer'].call(
         services:             (options[:services] || []).flatten.uniq, 
         tags:                 (options[:tags] || []).flatten.uniq,
+        skip_services:        (options[:skip_services] || []).flatten.uniq, 
         skip_compile:         options[:skip_compile] || false,
         require_confirmation: require_confirmation
       )
@@ -59,8 +61,8 @@ class KuberKit::CLI < Thor
     end
   end
 
-  desc "env ENV_FILE_NAME", "Return content of Env File ENV_FILE_NAME"
-  def env(env_file_name)
+  desc "envfile ENV_FILE_NAME", "Return content of Env File ENV_FILE_NAME"
+  def envfile(env_file_name)
     setup(options)
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
@@ -150,6 +152,15 @@ class KuberKit::CLI < Thor
     end
   end
 
+  desc "get RESOURCE_NAME", "List pods matching RESOURCE_NAME using kubectl"
+  def get(pod_name = nil)
+    setup(options)
+
+    if KuberKit::Container['actions.configuration_loader'].call(options.merge(load_inventory: false))
+      KuberKit::Container['actions.kubectl_get'].call(pod_name, options)
+    end
+  end
+
   desc "version", "Print current version"
   def version
     puts KuberKit::VERSION