kuber_kit 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 766eae8b402b82c6e307942d24f2ee60d87197ef0b966f8551e17b2926a8210b
-  data.tar.gz: eae14447e34ab527affdfbbbdd9b34027470b6c2b54b63bb27be8cdf651bbd27
+  metadata.gz: da99b8b516e2fa2eb9090dc78084bc4b3d40f6d5856e4d3ecbbb993b1cbdef5d
+  data.tar.gz: 73c76c08809d116b0c5f317959b45e5fb513b518592f791d8a0d32a185a5d88c
 SHA512:
-  metadata.gz: '086f8e0c1983f00c3b517d4bf8a90c53d4ba58395b429d65a0dd2afeb8e80aae0e5120adf3ea1936b3f7c343de57378ef4e6e5b45c4836eb3de82f73a8198bc7'
-  data.tar.gz: d236328533a9f15eba54dba8c777e54821ddab141aaf46ada97e88d35a7fc7fe7048bcb49ddb719b081d55a36883a8434c39632343a210b174343851eb43fa93
+  metadata.gz: 5953d83da7b07ebe1ee9be3ee803c6662c2a585bbc4b01a66ba9eb3232df86f11c6f9991e3e6ffd992828d25b5b9fc554bdb71ecd396026941b78f23448acb80
+  data.tar.gz: a36e8746b7caddea4fe4342df5be1bd7c5304856a613e42b805b119013b9f31cc40c5de9be8587b2f13850f8bc9aa1e1e0179f88904d9ec1b0d3617285261a9b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.4.9)
+    kuber_kit (0.5.0)
       cli-ui
       contracts-lite
       dry-auto_inject
@@ -20,7 +20,7 @@ GEM
     docile (1.3.2)
     dry-auto_inject (0.7.0)
       dry-container (>= 0.3.4)
-    dry-configurable (0.12.0)
+    dry-configurable (0.12.1)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5.0)
     dry-container (0.7.2)

data/example/services/compose_app.rb

@@ -1,5 +1,5 @@
 KuberKit
-  .define_service(:compose_app)
+  .define_service(:auth_app)
   .template(:docker_compose)
   .images(:ruby_app)
   .tags(:compose)

data/lib/kuber_kit.rb

@@ -165,12 +165,14 @@ module KuberKit
     autoload :TemplateReader, 'actions/template_reader'
     autoload :ServiceReader, 'actions/service_reader'
     autoload :ServiceDeployer, 'actions/service_deployer'
+    autoload :ServiceChecker, 'actions/service_checker'
     autoload :ConfigurationLoader, 'actions/configuration_loader'
     autoload :KubectlApplier, 'actions/kubectl_applier'
     autoload :KubectlAttacher, 'actions/kubectl_attacher'
     autoload :KubectlConsole, 'actions/kubectl_console'
     autoload :KubectlDescribe, 'actions/kubectl_describe'
     autoload :KubectlLogs, 'actions/kubectl_logs'
+    autoload :KubectlEnv, 'actions/kubectl_env'
   end
 
   module Extensions
@@ -178,6 +180,7 @@ module KuberKit
   end
 
   module Kubernetes
+    autoload :ResourceSelector, 'kubernetes/resource_selector'
     autoload :ResourcesFetcher, 'kubernetes/resources_fetcher'
   end
 

data/lib/kuber_kit/actions/kubectl_env.rb

@@ -0,0 +1,19 @@
+class KuberKit::Actions::KubectlEnv
+  include KuberKit::Import[
+    "shell.local_shell",
+    "ui"
+  ]
+
+  Contract Hash => Any
+  def call(options)
+    configuration   = KuberKit.current_configuration
+    kubeconfig_path = configuration.kubeconfig_path
+    ui.print_info("ENV", "export KUBECONFIG=#{kubeconfig_path}")
+
+    true
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+    
+    false
+  end
+end

data/lib/kuber_kit/actions/service_checker.rb

@@ -0,0 +1,32 @@
+class KuberKit::Actions::ServiceChecker
+  include KuberKit::Import[
+    "kubernetes.resources_fetcher",
+    "shell.local_shell",
+    "core.service_store",
+    "ui",
+  ]
+
+  Contract Hash => Any
+  def call(options)
+    services = service_store.all_definitions.values.map(&:service_name).map(&:to_s)
+
+    enabled_services  = KuberKit.current_configuration.enabled_services.map(&:to_s)
+    if enabled_services.any?
+      services = services.select{ |s| enabled_services.include?(s) }
+    end
+
+    deployments = resources_fetcher.call("deployments")
+
+    missing_services = services.select{ |s| !deployments.include?(s.gsub("_", "-")) }
+
+    ui.print_warning("Warning", "This command will only check services deployed using k8s")
+
+    ui.print_info("Missing", missing_services.inspect)
+
+    {}
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+
+    false
+  end
+end

data/lib/kuber_kit/cli.rb

@@ -86,6 +86,15 @@ class KuberKit::CLI < Thor
     end
   end
 
+  desc "check", "Check to make sure that all services are deployed"
+  def check()
+    setup(options)
+
+    if KuberKit::Container['actions.configuration_loader'].call(options)
+      KuberKit::Container['actions.service_checker'].call(options)
+    end
+  end
+
   desc "apply FILE_PATH", "Apply FILE_PATH with kubectl"
   def apply(file_path)
     setup(options)
@@ -132,6 +141,15 @@ class KuberKit::CLI < Thor
     end
   end
 
+  desc "env", "Show environment variables for given configuration"
+  def env()
+    setup(options)
+
+    if KuberKit::Container['actions.configuration_loader'].call(options.merge(load_inventory: false))
+      KuberKit::Container['actions.kubectl_env'].call(options)
+    end
+  end
+
   desc "version", "Print current version"
   def version
     puts KuberKit::VERSION

data/lib/kuber_kit/container.rb

@@ -21,6 +21,10 @@ class KuberKit::Container
     KuberKit::Actions::ServiceDeployer.new
   end
 
+  register "actions.service_checker" do
+    KuberKit::Actions::ServiceChecker.new
+  end
+
   register "actions.configuration_loader" do
     KuberKit::Actions::ConfigurationLoader.new
   end
@@ -45,6 +49,10 @@ class KuberKit::Container
     KuberKit::Actions::KubectlLogs.new
   end
 
+  register "actions.kubectl_env" do
+    KuberKit::Actions::KubectlEnv.new
+  end
+
   register "configs" do
     KuberKit::Configs.new
   end
@@ -269,6 +277,10 @@ class KuberKit::Container
     KuberKit::ServiceReader::Reader.new
   end
 
+  register "kubernetes.resource_selector" do
+    KuberKit::Kubernetes::ResourceSelector.new
+  end
+
   register "kubernetes.resources_fetcher" do
     KuberKit::Kubernetes::ResourcesFetcher.new
   end

data/lib/kuber_kit/kubernetes/resource_selector.rb

@@ -0,0 +1,33 @@
+class KuberKit::Kubernetes::ResourceSelector
+  include KuberKit::Import[
+    "kubernetes.resources_fetcher",
+    "shell.local_shell",
+    "ui"
+  ]
+
+  Contract String, KeywordArgs[
+    include_ingresses: Optional[Bool],
+    include_pods:      Optional[Bool]
+  ] => Any
+  def call(action_name, include_ingresses: false, include_pods: false)
+    deployments = resources_fetcher.call("deployments")
+    options  = deployments.map{|d| "deploy/#{d}" }
+    options  << "ingresses" if include_ingresses
+    options  << "pods" if include_pods
+    option  = ui.prompt("Please select resource to #{action_name}", options)
+
+    if option == "ingresses" && include_ingresses
+      ingresses = resources_fetcher.call("ingresses")
+      options   = ingresses.map{|d| "ingresses/#{d}" }
+      return ui.prompt("Please select ingress to #{action_name}", options)
+    end
+
+    if option == "pods" && include_pods
+      ingresses = resources_fetcher.call("pods")
+      options   = ingresses.map{|d| "pods/#{d}" }
+      return ui.prompt("Please select pod to #{action_name}", options)
+    end
+    
+    option
+  end
+end

data/lib/kuber_kit/kubernetes/resources_fetcher.rb

@@ -2,40 +2,17 @@ class KuberKit::Kubernetes::ResourcesFetcher
   include KuberKit::Import[
     "shell.kubectl_commands",
     "shell.local_shell",
-    "ui"
   ]
 
-  Contract String, KeywordArgs[
-    include_ingresses: Optional[Bool],
-    include_pods:      Optional[Bool]
-  ] => Any
-  def call(action_name, include_ingresses: false, include_pods: false)
-    deployments = get_resources("deployments")
-    options  = deployments.split(" ").map{|d| "deploy/#{d}" }
-    options  << "ingresses" if include_ingresses
-    options  << "pods" if include_pods
-    option  = ui.prompt("Please select resource to #{action_name}", options)
-
-    if option == "ingresses" && include_ingresses
-      ingresses = get_resources("ingresses")
-      options   = ingresses.split(" ").map{|d| "ingresses/#{d}" }
-      return ui.prompt("Please select ingress to #{action_name}", options)
-    end
-
-    if option == "pods" && include_pods
-      ingresses = get_resources("pods")
-      options   = ingresses.split(" ").map{|d| "pods/#{d}" }
-      return ui.prompt("Please select pod to #{action_name}", options)
-    end
+  Contract String => ArrayOf[String]
+  def call(resource_type)
+    current_configuration  = KuberKit.current_configuration
     
-    option
-  end
-
-  def get_resources(type)
     kubectl_commands.get_resources(
-      local_shell, type, 
-      jsonpath: ".items[*].metadata.name", 
-      namespace: KuberKit.current_configuration.deployer_namespace
+      local_shell, resource_type, 
+      jsonpath:         ".items[*].metadata.name", 
+      kubeconfig_path:  current_configuration.kubeconfig_path, 
+      namespace:        current_configuration.deployer_namespace
     )
   end
 end

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

@@ -60,19 +60,19 @@ class KuberKit::Shell::Commands::KubectlCommands
       command_parts << "-o jsonpath='{#{jsonpath}}'"
     end
 
-    result = kubectl_run(shell, command_parts, kubeconfig_path: kubeconfig_path, namespace: namespace)
+    result = kubectl_run(shell, command_parts, kubeconfig_path: kubeconfig_path, namespace: namespace).to_s
 
     # Hide warnings manually, until appropriate kubectl option will be available
-    result = result.split("\n").reject{|n| n.start_with?("Warning:") }.join("\n") if result.is_a?(String)
+    result = result.split("\n").reject{|n| n.start_with?("Warning:") }.join("\n")
 
-    result
+    Array(result.split(" ")).reject(&:empty?)
   end
 
   def resource_exists?(shell, resource_type, resource_name, kubeconfig_path: nil, namespace: nil)
     result = get_resources(shell, resource_type, 
       field_selector: "metadata.name=#{resource_name}", kubeconfig_path: kubeconfig_path, namespace: namespace
     )
-    result && result != ""
+    result.any?
   end
 
   def delete_resource(shell, resource_type, resource_name, kubeconfig_path: nil, namespace: nil)

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.4.9"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -209,7 +209,9 @@ files:
 - lib/kuber_kit/actions/kubectl_attacher.rb
 - lib/kuber_kit/actions/kubectl_console.rb
 - lib/kuber_kit/actions/kubectl_describe.rb
+- lib/kuber_kit/actions/kubectl_env.rb
 - lib/kuber_kit/actions/kubectl_logs.rb
+- lib/kuber_kit/actions/service_checker.rb
 - lib/kuber_kit/actions/service_deployer.rb
 - lib/kuber_kit/actions/service_reader.rb
 - lib/kuber_kit/actions/template_reader.rb
@@ -273,6 +275,7 @@ files:
 - lib/kuber_kit/image_compiler/image_builder.rb
 - lib/kuber_kit/image_compiler/image_dependency_resolver.rb
 - lib/kuber_kit/image_compiler/version_tag_builder.rb
+- lib/kuber_kit/kubernetes/resource_selector.rb
 - lib/kuber_kit/kubernetes/resources_fetcher.rb
 - lib/kuber_kit/preprocessing/file_preprocessor.rb
 - lib/kuber_kit/preprocessing/text_preprocessor.rb