kuber_kit 1.2.2 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f69884ef6e30281b67385b81819ffed74011f7a01e9358a0f1b77a7444331e5
-  data.tar.gz: e6cd8ab2e34d054a52080820b0d3ecf1839311a65b4c4549c78d174b55a98fc0
+  metadata.gz: bf57924285ae666f588c17e429237e45bf7fc1666683354a4b55de25592a994f
+  data.tar.gz: f8b7bcf9bcc1d82f9f3489d1d2b6763f281ca0398ef494b78ae11054c4c35019
 SHA512:
-  metadata.gz: 720a65d065a919c187c81d29d07813a6ab5cb8c5522c18cbe62fa9bb8dac5f148c6936ec7c56d4bfc6075b482569e4619bae81cc4dec8c01beb4c006182a4935
-  data.tar.gz: 063c4d468b3a0ffcb32e48ea71648f84ab4aa334dc64cc5efdfad5aa3ca9f6a08517733a15de79b89fc2c302543d1947a5af46fb65bf01c175094d8fc328027c
+  metadata.gz: ed268c5ca27198e9b9842d6f706f83cf83506e9abf8bb95bb23ed97a439b7ae8e9c867c6f88a2ad3a35a9cc2b8e969adbdd88363257e55f02b445f4075df933c
+  data.tar.gz: d2480528964184aadd99b9697898dcbc0da94cb7e8deac75496ea0bf7b47e7013c6c1824f897b4eb46b56b9ba954075b1740bc7ac3bc9ae9bb3d62b60dd2ce64

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+**1.2.5**
+- Improve handling ContextVars, ability to convert context var to OpenStruct
+
+**1.2.4**
+- Fix a mistake in setting env variables
+- Added an option to set "use local deployment" variable
+- Allow finding job resources in kit attach and kit log
+
 **1.2.2**
 - Support Ruby 3.2.0
 

data/lib/kuber_kit/actions/configuration_loader.rb

@@ -20,6 +20,7 @@ class KuberKit::Actions::ConfigurationLoader
     configurations_path  = options[:configurations_path]  || File.join(root_path, configs.configurations_dirname)
     configuration_name   = options[:configuration] || ENV["KUBER_KIT_CONFIGURATION"]
     load_inventory = options.fetch(:load_inventory, true)
+    use_local_deploy = options.fetch(:use_local_deploy, false)
 
     ui.print_debug "ConfigurationLoader", "Launching kuber_kit with:"
     ui.print_debug "ConfigurationLoader", "  Root path: #{root_path.to_s.yellow}"
@@ -28,6 +29,7 @@ class KuberKit::Actions::ConfigurationLoader
     ui.print_debug "ConfigurationLoader", "  Infrastructure path: #{infra_path.to_s.yellow}"
     ui.print_debug "ConfigurationLoader", "  Configurations path: #{configurations_path.to_s.yellow}"
     ui.print_debug "ConfigurationLoader", "  Configuration name: #{configuration_name.to_s.yellow}"
+    ui.print_debug "ConfigurationLoader", "  Use local deploy: #{use_local_deploy.to_s.yellow}"
 
     ui.print_info("Logs", "See logs at: #{configs.log_file_path}")
 
@@ -39,6 +41,10 @@ class KuberKit::Actions::ConfigurationLoader
       raise KuberKit::Error, "The minimal required kuber_kit version is #{configs.kuber_kit_min_version}"
     end
 
+    if use_local_deploy
+      ENV["KUBER_KIT_USE_LOCAL_DEPLOYMENT"] = "true"
+    end
+
     load_configurations(configurations_path, configuration_name)
     load_infrastructure(infra_path)
 
@@ -84,6 +90,10 @@ class KuberKit::Actions::ConfigurationLoader
       configuration_name   = first_configurations.configuration_name
     end
 
+    if configuration_store.count > 1 && configuration_name
+      ui.print_info("Configuration", "Using configuration: #{configuration_name.to_s.cyan}")
+    end
+
     if configuration_store.count > 1 && configuration_name.nil?
       options = all_configurations.map(&:configuration_name).map(&:to_s)
       configuration_name = ui.prompt("Please select configuration name (or set it using -C option)", options)

data/lib/kuber_kit/actions/kubectl_attacher.rb

@@ -7,17 +7,20 @@ class KuberKit::Actions::KubectlAttacher
   ]
 
   Contract Maybe[String], Hash => Any
-  def call(pod_name, options)
+  def call(resource_name, options)
     kubeconfig_path    = KuberKit.current_configuration.kubeconfig_path
     kubectl_entrypoint = KuberKit.current_configuration.kubectl_entrypoint
     deployer_namespace = KuberKit.current_configuration.deployer_namespace
 
-    if !pod_name
-      pod_name  = resource_selector.call("attach")
+    if !resource_name 
+      resource_name  = resource_selector.call("attach", additional_resources: [
+        KuberKit::Kubernetes::Resources::POD,
+        KuberKit::Kubernetes::Resources::JOB
+      ])
     end
 
     kubectl_commands.exec(
-      local_shell, pod_name, "bash", args: "-it", 
+      local_shell, resource_name, "bash", args: "-it", 
       kubeconfig_path: kubeconfig_path, 
       interactive:  true,
       namespace:    deployer_namespace,

data/lib/kuber_kit/actions/kubectl_logs.rb

@@ -7,12 +7,15 @@ class KuberKit::Actions::KubectlLogs
   ]
 
   Contract Maybe[String], Hash => Any
-  def call(pod_name, options)
+  def call(resource_name, options)
     kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
     deployer_namespace = KuberKit.current_configuration.deployer_namespace
 
-    if !pod_name 
-      pod_name = resource_selector.call("attach")
+    if !resource_name 
+      resource_name  = resource_selector.call("attach", additional_resources: [
+        KuberKit::Kubernetes::Resources::POD,
+        KuberKit::Kubernetes::Resources::JOB
+      ])
     end
 
     args = nil
@@ -21,7 +24,7 @@ class KuberKit::Actions::KubectlLogs
     end
 
     kubectl_commands.logs(
-      local_shell, pod_name,
+      local_shell, resource_name,
       args: args,
       kubeconfig_path: kubeconfig_path, 
       namespace: deployer_namespace

data/lib/kuber_kit/cli.rb

@@ -11,6 +11,7 @@ class KuberKit::CLI < Thor
   class_option :debug, :type => :boolean, aliases: ["-d"]
   class_option :configuration, :type => :string, aliases: ["-C"]
   class_option :user, :type => :string, aliases: ["-u"]
+  class_option :use_local_deploy, :type => :boolean, aliases: ["-l"]
 
   desc "compile IMAGE_NAMES", "Compile image with IMAGE_NAMES (comma-separated)"
   def compile(image_names_str)

data/lib/kuber_kit/core/context_helper/context_vars.rb

@@ -1,15 +1,21 @@
+require 'ostruct'
 class KuberKit::Core::ContextHelper::ContextVars
   attr_reader :parent, :parent_name
 
   BuildArgUndefined = Class.new(KuberKit::Error)
 
-  def initialize(context_vars, parent_name = nil, parent = nil)
+  def initialize(context_vars, parent_name = nil)
     @context_vars = context_vars
     @parent_name  = parent_name
-    @parent = parent
   end
 
-  def read(*variable_names)
+  def read(*variable_names, default: nil)
+    dig(*variable_names)
+  rescue BuildArgUndefined
+    return default
+  end
+
+  def dig(*variable_names)
     result = self
     variable_names.each do |var|
       result = result.get_variable_value(var)
@@ -18,7 +24,7 @@ class KuberKit::Core::ContextHelper::ContextVars
   end
 
   def variable_defined?(*variable_names)
-    read(*variable_names) 
+    dig(*variable_names)
     return true
   rescue BuildArgUndefined
     return false
@@ -29,15 +35,30 @@ class KuberKit::Core::ContextHelper::ContextVars
       raise ArgumentError.new("context args does not accept any arguments")
     end
 
-    read(name)
+    dig(name)
+  end
+
+  def keys
+    @context_vars.keys
   end
 
   def to_h
-    if @context_vars.is_a?(Hash)
-      return @context_vars
-    else
-      return {value: @context_vars}
+    values = keys.map do |key|
+      value = get_variable_value(key)
+      hash_value = value.respond_to?(:to_h) ? value.to_h : value
+      [key, hash_value]
     end
+    Hash[values]
+  end
+
+  def to_struct
+    values = keys.map do |key|
+      value = get_variable_value(key)
+      hash_value = value.respond_to?(:to_struct) ? value.to_struct : value
+      [key, hash_value]
+    end
+    hash = Hash[values]
+    OpenStruct.new(hash)
   end
 
   def get_variable_value(variable_name)
@@ -46,23 +67,16 @@ class KuberKit::Core::ContextHelper::ContextVars
     end
 
     if value.is_a?(Hash)
-      return self.class.new(value, variable_name, self)
+      return self.class.new(value, format_arg(variable_name))
     end
 
     value
   end
 
   private
+    
 
     def format_arg(name)
-      string = [@parent_name, name].compact.join(".")
-      parent = @parent
-
-      while parent do
-        string = [parent.parent_name, string].compact.join(".")
-        parent = parent.parent
-      end
-
-      string
+      [@parent_name, name].compact.join(".")
     end
 end

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

@@ -26,6 +26,6 @@ class KuberKit::ShellLauncher::Strategies::Kubernetes < KuberKit::ShellLauncher:
       env_vars << "KUBER_KIT_CONFIGURATION=#{KuberKit.current_configuration.name}"
     end
 
-    shell.replace!(env: ["KUBECONFIG=#{kubeconfig_path}", "KUBER_KIT_SHELL_CONFIGURATION=#{KuberKit.current_configuration.name}"])
+    shell.replace!(env: env_vars)
   end
 end

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "1.2.2"
+  VERSION = "1.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.5
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-05 00:00:00.000000000 Z
+date: 2023-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts
@@ -397,7 +397,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Docker Containers Build & Deployment