kuber_kit 0.8.8 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d30438270f3b2b82520081fc47903c6a19fdf916369bb238a387bc99b8fa7ab
-  data.tar.gz: 661c969777f171ead96170c795f04d4cce93989eec75de7a89bf65f8e4711e62
+  metadata.gz: 6eb3dda64697fc3174d3ae031a7eba5be1f57e80d0c8c43829ff3b36edca38b2
+  data.tar.gz: 85a77edc9bdc91c09c6ba6f3e677df032168c66a69a563ddd9087734fa9636bc
 SHA512:
-  metadata.gz: 7db454d99455a028a8a235efb4873ea199f38800e818e868d54dc29626ab2694f73e4264a3ec61aa5a355e1b4aaeebabf17fee92efb9e630407dacb004513ee9
-  data.tar.gz: 00412d664f4beb3ae004a04b916dc75bb7d7284a1a4c8add1a283f2039953fdcd4e84e219432e6fde1fe3a1111af54eec07cdc9b8671b59f9c501dd1dd12ce9c
+  metadata.gz: 1696812c543f40ec81cb7c4c7804f4f02e739cf7ccff6820f37b884f7965a0822ceb1b2dbc42e7ca9d696f7d539d5b0e44ff6142991178bd9316bdd98276ca09
+  data.tar.gz: 8887273eba2ca2b3f714249d4da29dfb826477e08da4f09d06ab9974c5a32e8b698bbeb2f9b0bb7a6cbd75884aba3bedca6adc71ee7d7e53a1a8d3637b798d7f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+**0.9.0**
+- Allow skipping confirmation during deployment
+- Added `kit sh` command to create a new shell
+- Do not expand directory path in config
+
 **0.8.4-0.8.8**
 - Added initial services support, to deploy before all other servies
 - Allow namespace as symbol in kubectl commands

data/lib/kuber_kit/actions/shell_launcher.rb

@@ -0,0 +1,18 @@
+class KuberKit::Actions::ShellLauncher
+  include KuberKit::Import[
+    "shell.local_shell",
+    "shell_launcher.action_handler",
+    "ui",
+  ]
+
+  Contract nil => Any
+  def call()
+    action_handler.call(local_shell)
+
+    true
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+    
+    false
+  end
+end

data/lib/kuber_kit/cli.rb

@@ -41,6 +41,7 @@ class KuberKit::CLI < Thor
   method_option :skip_compile,          :type => :boolean,  aliases: ["-B"]
   method_option :skip_dependencies,     :type => :boolean,  aliases: ["-D"]
   method_option :require_confirmation,  :type => :boolean,  aliases: ["-r"]
+  method_option :skip_confirmation,     :type => :boolean,  aliases: ["-R"]
   def deploy
     setup(options)
 
@@ -48,6 +49,7 @@ class KuberKit::CLI < Thor
       require_confirmation = options[:require_confirmation] || 
                              KuberKit.current_configuration.deployer_require_confirmation ||
                              false
+      require_confirmation = false if options[:skip_confirmation]
       started_at = Time.now.to_i
       action_result = KuberKit::Container['actions.service_deployer'].call(
         services:             (options[:services] || []).flatten.uniq, 
@@ -161,6 +163,15 @@ class KuberKit::CLI < Thor
     end
   end
 
+  desc "sh", "Create a new shell with KUBECONFIG env variable in place"
+  def sh()
+    setup(options)
+
+    if KuberKit::Container['actions.configuration_loader'].call(options.merge(load_inventory: false))
+      KuberKit::Container['actions.shell_launcher'].call()
+    end
+  end
+
   desc "get RESOURCE_NAME", "List pods matching RESOURCE_NAME using kubectl"
   def get(pod_name = nil)
     setup(options)

data/lib/kuber_kit/configs.rb

@@ -5,7 +5,7 @@ class KuberKit::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, :deployer_strategy, :compile_simultaneous_limit, :deploy_simultaneous_limit,
-    :additional_images_paths, :deprecation_warnings_disabled, :log_file_path, :env_file_compile_dir
+    :additional_images_paths, :deprecation_warnings_disabled, :log_file_path, :env_file_compile_dir, :shell_launcher_strategy
   ]
   DOCKER_IGNORE_LIST = [
     'Dockerfile',
@@ -34,7 +34,7 @@ class KuberKit::Configs
   end
 
   def add_default_configs
-    home_kuber_kit_path = File.expand_path(File.join("~", ".kuber_kit"))
+    home_kuber_kit_path = File.join("~", ".kuber_kit")
     
     set :image_dockerfile_name,   "Dockerfile"
     set :image_build_context_dir, "build_context"
@@ -50,6 +50,7 @@ class KuberKit::Configs
     set :artifact_clone_dir,      File.join(home_kuber_kit_path, "artifacts")
     set :service_config_dir,      File.join(home_kuber_kit_path, "services")
     set :deployer_strategy,         :kubernetes
+    set :shell_launcher_strategy,   :kubernetes
     set :compile_simultaneous_limit, 5
     set :deploy_simultaneous_limit,  5
     set :additional_images_paths, []

data/lib/kuber_kit/container.rb

@@ -57,6 +57,10 @@ class KuberKit::Container
     KuberKit::Actions::KubectlEnv.new
   end
 
+  register "actions.shell_launcher" do
+    KuberKit::Actions::ShellLauncher.new
+  end
+
   register "configs" do
     KuberKit::Configs.new
   end
@@ -293,18 +297,6 @@ class KuberKit::Container
     KuberKit::ServiceDeployer::ServiceDependencyResolver.new
   end
 
-  register "service_deployer.strategies.kubernetes" do
-    KuberKit::ServiceDeployer::Strategies::Kubernetes.new
-  end
-
-  register "service_deployer.strategies.docker" do
-    KuberKit::ServiceDeployer::Strategies::Docker.new
-  end
-
-  register "service_deployer.strategies.docker_compose" do
-    KuberKit::ServiceDeployer::Strategies::DockerCompose.new
-  end
-
   register "service_reader.action_handler" do
     KuberKit::ServiceReader::ActionHandler.new
   end
@@ -313,6 +305,14 @@ class KuberKit::Container
     KuberKit::ServiceReader::Reader.new
   end
 
+  register "shell_launcher.action_handler" do
+    KuberKit::ShellLauncher::ActionHandler.new
+  end
+
+  register "shell_launcher.launcher" do
+    KuberKit::ShellLauncher::Launcher.new
+  end
+
   register "kubernetes.resource_selector" do
     KuberKit::Kubernetes::ResourceSelector.new
   end

data/lib/kuber_kit/core/configuration.rb

@@ -2,7 +2,8 @@ class KuberKit::Core::Configuration
   attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubeconfig_path, :kubectl_entrypoint,
               :services_attributes, :enabled_services, :disabled_services, :default_services,
               :initial_services, :build_servers, :global_build_vars,
-              :deployer_strategy, :deployer_namespace, :deployer_require_confirmation
+              :deployer_strategy, :deployer_namespace, :deployer_require_confirmation,
+              :shell_launcher_strategy
 
   Contract KeywordArgs[
     name:                 Symbol,
@@ -21,12 +22,13 @@ class KuberKit::Core::Configuration
     global_build_vars:    HashOf[Symbol => Any],
     deployer_strategy:              Symbol,
     deployer_namespace:             Maybe[Or[Symbol, String]],
-    deployer_require_confirmation: Bool,
+    deployer_require_confirmation:  Bool,
+    shell_launcher_strategy:        Symbol,
   ] => Any
   def initialize(name:, artifacts:, registries:, env_files:, templates:, kubeconfig_path:, kubectl_entrypoint:,
                  services_attributes:, enabled_services:, disabled_services:, default_services:, 
                  initial_services:, build_servers:, global_build_vars:,
-                 deployer_strategy:, deployer_namespace:, deployer_require_confirmation:)
+                 deployer_strategy:, deployer_namespace:, deployer_require_confirmation:, shell_launcher_strategy:)
     @name                 = name
     @artifacts            = artifacts
     @registries           = registries
@@ -43,7 +45,8 @@ class KuberKit::Core::Configuration
     @global_build_vars    = global_build_vars
     @deployer_strategy              = deployer_strategy
     @deployer_namespace             = deployer_namespace
-    @deployer_require_confirmation = deployer_require_confirmation
+    @deployer_require_confirmation  = deployer_require_confirmation
+    @shell_launcher_strategy        = shell_launcher_strategy
   end
 
   def service_attributes(service_name)

data/lib/kuber_kit/core/configuration_definition.rb

@@ -36,7 +36,8 @@ class KuberKit::Core::ConfigurationDefinition
       global_build_vars:    @global_build_vars,
       deployer_strategy:              @deployer_strategy,
       deployer_namespace:             @deployer_namespace,
-      deployer_require_confirmation: @deployer_require_confirmation || false,
+      deployer_require_confirmation:  @deployer_require_confirmation || false,
+      shell_launcher_strategy:        @shell_launcher_strategy,
     )
   end
 
@@ -102,8 +103,8 @@ class KuberKit::Core::ConfigurationDefinition
     self
   end
 
-  def deployer_strategy(path)
-    @deployer_strategy = path
+  def deployer_strategy(strategy)
+    @deployer_strategy = strategy
 
     self
   end
@@ -115,6 +116,12 @@ class KuberKit::Core::ConfigurationDefinition
   end
   alias_method :deployer_require_confirimation, :deployer_require_confirmation
 
+  def shell_launcher_strategy(strategy)
+    @shell_launcher_strategy = path
+
+    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

@@ -36,7 +36,8 @@ class KuberKit::Core::ConfigurationFactory
       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_confirmation: configuration_attrs.deployer_require_confirmation,
+      deployer_require_confirmation:  configuration_attrs.deployer_require_confirmation,
+      shell_launcher_strategy:        configuration_attrs.shell_launcher_strategy || configs.shell_launcher_strategy,
     )
   end
 

data/lib/kuber_kit/core/service.rb

@@ -1,5 +1,5 @@
 class KuberKit::Core::Service
-  AttributeNotSet = Class.new(Indocker::Error)
+  AttributeNotSet = Class.new(KuberKit::Error)
 
   attr_reader :name, :dependencies, :template_name, :tags, :images, :attributes, :deployer_strategy
 

data/lib/kuber_kit/defaults.rb

@@ -7,26 +7,48 @@ class KuberKit::Defaults
     end
 
     def init!
-      KuberKit::Container["artifacts_sync.artifact_updater"].use_resolver(
-        KuberKit::Container["artifacts_sync.git_artifact_resolver"], 
+      container["artifacts_sync.artifact_updater"].use_resolver(
+        container["artifacts_sync.git_artifact_resolver"], 
         artifact_class: KuberKit::Core::Artifacts::Git
       )
-      KuberKit::Container["artifacts_sync.artifact_updater"].use_resolver(
-        KuberKit::Container["artifacts_sync.null_artifact_resolver"], 
+      container["artifacts_sync.artifact_updater"].use_resolver(
+        container["artifacts_sync.null_artifact_resolver"], 
         artifact_class: KuberKit::Core::Artifacts::Local
       )
-      KuberKit::Container["env_file_reader.reader"].use_reader(
-        KuberKit::Container["env_file_reader.strategies.artifact_file"], 
+      container["env_file_reader.reader"].use_reader(
+        container["env_file_reader.strategies.artifact_file"], 
         env_file_class: KuberKit::Core::EnvFiles::ArtifactFile
       )
-      KuberKit::Container["env_file_reader.reader"].use_reader(
-        KuberKit::Container["env_file_reader.strategies.env_group"], 
+      container["env_file_reader.reader"].use_reader(
+        container["env_file_reader.strategies.env_group"], 
         env_file_class: KuberKit::Core::EnvFiles::EnvGroup
       )
-      KuberKit::Container["template_reader.reader"].use_reader(
-        KuberKit::Container["template_reader.strategies.artifact_file"], 
+      container["template_reader.reader"].use_reader(
+        container["template_reader.strategies.artifact_file"], 
         template_class: KuberKit::Core::Templates::ArtifactFile
       )
+      container["service_deployer.deployer"].register_strategy(
+        :kubernetes,
+        KuberKit::ServiceDeployer::Strategies::Kubernetes.new
+      )
+      container["service_deployer.deployer"].register_strategy(
+        :docker,
+        KuberKit::ServiceDeployer::Strategies::Docker.new
+      )
+      container["service_deployer.deployer"].register_strategy(
+        :docker_compose,
+        KuberKit::ServiceDeployer::Strategies::DockerCompose.new
+      )
+
+      container["shell_launcher.launcher"].register_strategy(
+        :kubernetes,
+        KuberKit::ShellLauncher::Strategies::Kubernetes.new
+      )
     end
+
+    private
+      def container
+        KuberKit::Container
+      end
   end
 end

data/lib/kuber_kit/service_deployer/deployer.rb

@@ -3,16 +3,8 @@ class KuberKit::ServiceDeployer::Deployer
 
   include KuberKit::Import[
     "core.service_store",
-    "service_deployer.strategies.kubernetes",
-    "service_deployer.strategies.docker",
-    "service_deployer.strategies.docker_compose"
   ]
 
-  def initialize(**injected_deps, &block)
-    super(**injected_deps)
-    add_default_strategies
-  end
-
   def register_strategy(strategy_name, strategy)
     @@strategies ||= {}
 
@@ -31,15 +23,4 @@ class KuberKit::ServiceDeployer::Deployer
 
     deployer.deploy(shell, service)
   end
-
-  def reset!
-    @@strategies = {}
-  end
-
-  private
-    def add_default_strategies
-      register_strategy(:kubernetes, kubernetes)
-      register_strategy(:docker, docker)
-      register_strategy(:docker_compose, docker_compose)
-    end
 end

data/lib/kuber_kit/shell/abstract_shell.rb

@@ -10,6 +10,10 @@ class KuberKit::Shell::AbstractShell
     raise KuberKit::NotImplementedError, "must be implemented"
   end
 
+  def replace!(shell_name: nil, env: [])
+    raise KuberKit::NotImplementedError, "must be implemented"
+  end
+
   def read(file_path)
     raise KuberKit::NotImplementedError, "must be implemented"
   end

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

@@ -130,4 +130,10 @@ class KuberKit::Shell::Commands::KubectlCommands
 
     kubectl_run(shell, command_parts, kubeconfig_path: kubeconfig_path, namespace: namespace)
   end
+
+  def set_namespace(shell, namespace, kubeconfig_path: nil)
+    command = %Q{config set-context --current --namespace=#{namespace}}
+
+    kubectl_run(shell, command, kubeconfig_path: kubeconfig_path)
+  end
 end

data/lib/kuber_kit/shell/local_shell.rb

@@ -58,6 +58,17 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
     end
   end
 
+  def replace!(shell_name: nil, env: [], log_command: true)
+    shell_name ||= "$SHELL"
+    command = (env + [shell_name]).join(" ")
+
+    if log_command
+      ui.print_debug("LocalShell", "Replace Shell: #{command.to_s.cyan}")
+    end
+
+    system_exec(command)
+  end
+
   def sync(local_path, remote_path, exclude: nil, delete: true)
     rsync_commands.rsync(self, local_path, remote_path, exclude: exclude, delete: delete)
   end
@@ -117,6 +128,10 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
   end
 
   private
+    def system_exec(command)
+      exec(command)
+    end
+
     def ensure_directory_exists(file_path)
       dir_path = File.dirname(file_path)
 

data/lib/kuber_kit/shell/ssh_shell.rb

@@ -42,6 +42,10 @@ class KuberKit::Shell::SshShell < KuberKit::Shell::LocalShell
     raise "Currently interactive run is not supported for ssh shell."
   end
 
+  def replace!(shell_name: nil, env: [])
+    raise "Currently repliace 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/shell_launcher/action_handler.rb

@@ -0,0 +1,12 @@
+class KuberKit::ShellLauncher::ActionHandler
+  include KuberKit::Import[
+    "shell_launcher.launcher",
+  ]
+
+  Contract KuberKit::Shell::AbstractShell => Any
+  def call(shell)
+    strategy_name = KuberKit.current_configuration.shell_launcher_strategy
+
+    launcher.call(shell, strategy_name)
+  end
+end

data/lib/kuber_kit/shell_launcher/launcher.rb

@@ -0,0 +1,31 @@
+class KuberKit::ShellLauncher::Launcher
+  StrategyNotFoundError = Class.new(KuberKit::NotFoundError)
+
+  include KuberKit::Import[
+    "core.service_store",
+  ]
+
+  Contract KuberKit::Shell::AbstractShell, Symbol => Any
+  def call(shell, strategy_name)
+    launcher = get_strategy(strategy_name)
+
+    raise StrategyNotFoundError, "Can't find strategy with name #{strategy_name}" if launcher.nil?
+
+    launcher.call(shell)
+  end
+
+  def register_strategy(strategy_name, strategy)
+    @@strategies ||= {}
+
+    if !strategy.is_a?(KuberKit::ShellLauncher::Strategies::Abstract)
+      raise ArgumentError.new("should be an instance of KuberKit::ShellLauncher::Strategies::Abstract, got: #{strategy.inspect}")
+    end
+
+    @@strategies[strategy_name] = strategy
+  end
+
+  def get_strategy(strategy_name)
+    @@strategies ||= {}
+    @@strategies[strategy_name]
+  end
+end

data/lib/kuber_kit/shell_launcher/strategies/abstract.rb

@@ -0,0 +1,5 @@
+class KuberKit::ShellLauncher::Strategies::Abstract
+  def call(shell, service)
+    raise KuberKit::NotImplementedError, "must be implemented"
+  end
+end

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

@@ -0,0 +1,22 @@
+class KuberKit::ShellLauncher::Strategies::Kubernetes < KuberKit::ShellLauncher::Strategies::Abstract
+  include KuberKit::Import[
+    "service_reader.reader",
+    "shell.kubectl_commands",
+    "configs",
+  ]
+
+  Contract KuberKit::Shell::AbstractShell => Any
+  def call(shell)
+    kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
+    if kubeconfig_path.is_a?(KuberKit::Core::ArtifactPath)
+      kubeconfig_path = artifact_path_resolver.call(kubeconfig_path)
+    end
+
+    deployer_namespace = KuberKit.current_configuration.deployer_namespace
+    if deployer_namespace
+      kubectl_commands.set_namespace(shell, deployer_namespace, kubeconfig_path: kubeconfig_path)
+    end
+
+    shell.replace!(env: ["KUBECONFIG=#{kubeconfig_path}"])
+  end
+end

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.8.8"
+  VERSION = "0.9.0"
 end

data/lib/kuber_kit.rb

@@ -174,6 +174,16 @@ module KuberKit
     autoload :Reader, 'service_reader/reader'
   end
 
+  module ShellLauncher
+    autoload :ActionHandler, 'shell_launcher/action_handler'
+    autoload :Launcher, 'shell_launcher/launcher'
+
+    module Strategies
+      autoload :Abstract, 'shell_launcher/strategies/abstract'
+      autoload :Kubernetes, 'shell_launcher/strategies/kubernetes'
+    end
+  end
+
   module Actions
     autoload :ActionResult, 'actions/action_result'
     autoload :ImageCompiler, 'actions/image_compiler'
@@ -190,6 +200,7 @@ module KuberKit
     autoload :KubectlGet, 'actions/kubectl_get'
     autoload :KubectlLogs, 'actions/kubectl_logs'
     autoload :KubectlEnv, 'actions/kubectl_env'
+    autoload :ShellLauncher, 'actions/shell_launcher'
   end
 
   module Extensions