kuber_kit 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f98d973c015745f6a4ccf054e3b97edbd8302683f747842ad6c9c5b3e4e49087
-  data.tar.gz: f2e8eb96e320bc73c1c3b03c611d1990515bd55182a93f30b28966b63da0c591
+  metadata.gz: b6b58c988d13591ad950347cc3c2af370ab1604006d1ad0d04cf9cf43093ca36
+  data.tar.gz: 9b821db9a6f199ba10d9c8e509ba8f20eba2f91ecf400254f179d8e8099e2a82
 SHA512:
-  metadata.gz: d550a0a8738447c939b5f6085ef71c7b79898854ede9c6e526e07f73fd4cf6a660b5a18c4e9277f80b081dc41f21f3371aafa69099d6383c884e954b7d15d9ae
-  data.tar.gz: 8b8ae8685c357608a6db776443171a1ea34d387272fe72f4802164e3345c7b6bf37d558d7967e5315d8718dbcf2a6a902cad2c1e3e84bb4de0b5811b1d075574
+  metadata.gz: 911c9304545c3182c42d8dab5dcdb52208b59479318cf8324d8b0654a3315865c73fa10f430fbe16618a1deae5fabeb45a783fa6e3430e2da86777d06689987e
+  data.tar.gz: bf884a9e9f0cbbc35b88069d532baa021e973ad425c0bd9b2236aac12736448c53d99798da8abbcab1bf284484de5ac850bbee5e2cf0d7d8004326ceb836271c

data/Gemfile.lock

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

data/TODO.md

@@ -1,7 +1,5 @@
 - https://ttytoolkit.org/
 - kit status should show the list of services and their status, with ability to select & view logs
-- list services and require confirmation before deployment
-- add kit logs support, should work similar to kit attach
 - allow deploying only services enabled for specific configuration
 - find a way to always deploy some service, e.g. for migrations and env_files
 - template should be able to set default attributes

data/example/configurations/review.rb

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

data/lib/kuber_kit/actions/service_deployer.rb

@@ -9,11 +9,12 @@ class KuberKit::Actions::ServiceDeployer
   ]
 
   Contract KeywordArgs[
-    services:     Maybe[ArrayOf[String]],
-    tags:         Maybe[ArrayOf[String]],
-    skip_compile: Maybe[Bool],
+    services:             Maybe[ArrayOf[String]],
+    tags:                 Maybe[ArrayOf[String]],
+    skip_compile:         Maybe[Bool],
+    require_confirmation: Maybe[Bool],
   ] => Any
-  def call(services:, tags:, skip_compile: false)
+  def call(services:, tags:, skip_compile: false, require_confirmation: false)
     if services.empty? && tags.empty?
       services, tags = show_tags_selection
     end
@@ -25,6 +26,15 @@ class KuberKit::Actions::ServiceDeployer
 
     unless 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(", ")
+    ui.print_info "ServiceDeployer", "The following services will be deployed: #{services_list}"
+
+    if require_confirmation
+      result = ui.prompt("Please confirm to continue deployment", ["confirm".green, "cancel".red])
+      return false unless result == "confirm".green
     end
 
     services = service_names.map do |service_name|

data/lib/kuber_kit/cli.rb

@@ -29,17 +29,22 @@ class KuberKit::CLI < Thor
   end
 
   desc "deploy CONTEXT_NAME", "Deploy CONTEXT_NAME with kubectl"
-  method_option :services,      :type => :array,    aliases: ["-s"]
-  method_option :tags,          :type => :array,    aliases: ["-t"]
-  method_option :skip_compile,  :type => :boolean,  aliases: ["-B"]
+  method_option :services,              :type => :array,    aliases: ["-s"]
+  method_option :tags,                  :type => :array,    aliases: ["-t"]
+  method_option :skip_compile,          :type => :boolean,  aliases: ["-B"]
+  method_option :require_confirmation,  :type => :boolean,  aliases: ["-r"]
   def deploy
     setup(options)
 
     if KuberKit::Container['actions.configuration_loader'].call(options)
+      require_confirmation = options[:require_confirmation] || 
+                             KuberKit.current_configuration.deployer_require_confirimation ||
+                             false
       result = KuberKit::Container['actions.service_deployer'].call(
-        services:     options[:services] || [], 
-        tags:         options[:tags] || [],
-        skip_compile: options[:skip_compile] || false
+        services:             options[:services] || [], 
+        tags:                 options[:tags] || [],
+        skip_compile:         options[:skip_compile] || false,
+        require_confirmation: require_confirmation
       )
     end
 

data/lib/kuber_kit/core/configuration.rb

@@ -1,35 +1,37 @@
 class KuberKit::Core::Configuration
   attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubeconfig_path, 
-              :deployer_strategy, :deployer_namespace, :services_attributes, :build_servers,
-              :global_build_vars
+              :services_attributes, :build_servers, :global_build_vars,
+              :deployer_strategy, :deployer_namespace, :deployer_require_confirimation
 
   Contract KeywordArgs[
-    name:            Symbol,
-    artifacts:       Hash,
-    registries:      Hash,
-    env_files:       Hash,
-    templates:       Hash,
-    kubeconfig_path: Maybe[String],
-    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],
+    name:                 Symbol,
+    artifacts:            Hash,
+    registries:           Hash,
+    env_files:            Hash,
+    templates:            Hash,
+    kubeconfig_path:      Maybe[String],
+    services_attributes:  HashOf[Symbol => Hash],
+    build_servers:        ArrayOf[KuberKit::Core::BuildServers::AbstractBuildServer],
+    global_build_vars:    HashOf[Symbol => Any],
+    deployer_strategy:              Symbol,
+    deployer_namespace:             Maybe[Symbol],
+    deployer_require_confirimation: Bool,
   ] => Any
   def initialize(name:, artifacts:, registries:, env_files:, templates:, kubeconfig_path:, 
-                 deployer_strategy:, deployer_namespace:, services_attributes:, build_servers:, 
-                 global_build_vars:)
-    @name             = name
-    @artifacts        = artifacts
-    @registries       = registries
-    @env_files        = env_files
-    @templates        = templates
-    @kubeconfig_path  = kubeconfig_path
-    @deployer_strategy  = deployer_strategy
-    @deployer_namespace = deployer_namespace
-    @build_servers    = build_servers
+                 services_attributes:, build_servers:, global_build_vars:,
+                 deployer_strategy:, deployer_namespace:, deployer_require_confirimation:)
+    @name                 = name
+    @artifacts            = artifacts
+    @registries           = registries
+    @env_files            = env_files
+    @templates            = templates
+    @kubeconfig_path      = kubeconfig_path
+    @build_servers        = build_servers
     @services_attributes  = services_attributes
     @global_build_vars    = global_build_vars
+    @deployer_strategy              = deployer_strategy
+    @deployer_namespace             = deployer_namespace
+    @deployer_require_confirimation = deployer_require_confirimation
   end
 
   def service_attributes(service_name)

data/lib/kuber_kit/core/configuration_definition.rb

@@ -17,18 +17,19 @@ class KuberKit::Core::ConfigurationDefinition
 
   def to_attrs
     OpenStruct.new(
-      name:             @configuration_name,
-      artifacts:        @artifacts,
-      registries:       @registries,
-      env_files:        @env_files,
-      templates:        @templates,
-      kubeconfig_path:  @kubeconfig_path,
-      deployer_strategy:  @deployer_strategy,
-      deployer_namespace: @deployer_namespace,
-      enabled_services: @enabled_services,
-      build_servers:    @build_servers,
+      name:                 @configuration_name,
+      artifacts:            @artifacts,
+      registries:           @registries,
+      env_files:            @env_files,
+      templates:            @templates,
+      kubeconfig_path:      @kubeconfig_path,
+      enabled_services:     @enabled_services,
+      build_servers:        @build_servers,
       services_attributes:  @services_attributes,
       global_build_vars:    @global_build_vars,
+      deployer_strategy:              @deployer_strategy,
+      deployer_namespace:             @deployer_namespace,
+      deployer_require_confirimation: @deployer_require_confirimation || false,
     )
   end
 
@@ -94,6 +95,12 @@ class KuberKit::Core::ConfigurationDefinition
     self
   end
 
+  def deployer_require_confirimation
+    @deployer_require_confirimation = true
+
+    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

@@ -20,17 +20,18 @@ 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,
-      deployer_strategy:  configuration_attrs.deployer_strategy || configs.deployer_strategy,
-      deployer_namespace: configuration_attrs.deployer_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,
+      build_servers:        build_servers,
       services_attributes:  configuration_attrs.services_attributes,
       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_confirimation: configuration_attrs.deployer_require_confirimation,
     )
   end
 

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

@@ -25,8 +25,8 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
     end
     
     container_name = strategy_options.fetch(:container_name, service.uri)
-    command_name   = strategy_options.fetch(:command_name, "bash")
-    custom_args   = strategy_options.fetch(:custom_args, nil)
+    command_name   = strategy_options.fetch(:command_name, nil)
+    custom_args    = strategy_options.fetch(:custom_args, nil)
     networks       = strategy_options.fetch(:networks, [])
     volumes        = strategy_options.fetch(:volumes, [])
 
@@ -50,7 +50,8 @@ class KuberKit::ServiceDeployer::Strategies::Docker < KuberKit::ServiceDeployer:
       custom_args << "--network #{network}"
     end
     volumes.each do |volume|
-      docker_commands.create_volume(shell, volume)
+      volume_name, _ = volume.split(":")
+      docker_commands.create_volume(shell, volume_name) unless volume_name.start_with?("/")
       custom_args << "--volume #{volume}"
     end
 

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

@@ -25,8 +25,8 @@ class KuberKit::ServiceDeployer::Strategies::DockerCompose < KuberKit::ServiceDe
     end
 
     service_name = strategy_options.fetch(:service_name, service.name.to_s)
-    command_name = strategy_options.fetch(:command_name, "bash")
-    custom_args = strategy_options.fetch(:custom_args, nil)
+    command_name = strategy_options.fetch(:command_name, nil)
+    custom_args  = strategy_options.fetch(:custom_args, nil)
 
     docker_compose_commands.run(shell, config_path, 
       service:  service_name, 

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Iskander Khaziev