kuber_kit 0.7.1 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5384a7795eb49fdf9beeb9481fc03e871fb001cda72d365a646f2ca3885309e9
-  data.tar.gz: 229512248e019960f5f178cdd4a5c7ca99ca808d70e7286884fc152570366e73
+  metadata.gz: b69eac4e6129cfa8a312b6066fc9d1a8164885928880add9c170ebb1a8914519
+  data.tar.gz: a38ea5783826d7366cf03eb6722132a9a1167b6a418d94d8be2442571f760d1a
 SHA512:
-  metadata.gz: 8ab657438fc9c8463528fed4938518365abda3b944416600ad3032deff7deb8afbd2c90cca99b1fea97f9d148d2b8df77759b11a10c441fa7d7c1f672897641e
-  data.tar.gz: 70824969dae53951c1ac194922dc76d3773d6f65e8c51ff3589c46de9ec702d027a55ad9516e9846b81cde969c2ebab7cdb84be5f5617b216854929fd56c6bdb
+  metadata.gz: bdb45aac937ba742197e8d5686ea18253fc0cb6093291bc34bc026b3a60f212cd347b9b54c16640561f33dc8e687e96f234b581402833604d26883ac852b3889
+  data.tar.gz: 337c593fd7826908f5b388829844ee0220e3851fb8117313afcd83f4ebd54b5cfac7747a4da497b6873eb995bc8d3d80a88776e845c5c45398b24ac4fc16b642

data/CHANGELOG.md

@@ -1,4 +1,15 @@
-**0.7.0**
+**0.8.3**
+- Always load artifacts, if kubeconfig is an artifact
+
+**0.8.2**
+- Update Kit Env command to support kubeconfig path as artifact
+
+**0.8.1**
+- Allow deploying services without dependecies
+- Default services should be first in the list
+- KubeConfig should be able to take file from artifact
+
+**0.7.1**
 - Added Ruby 3.0 support
 
 **0.6.4**

data/README.md

@@ -12,6 +12,29 @@ Add this line to your application's Gemfile:
 gem 'kuber_kit'
 ```
 
+## Usage
+
+### Available commands
+
+* `kit apply FILE_PATH` - Apply FILE_PATH with kubectl. Doesn't guarantee service restart. E.g. `kit apply -C community ~/.kuber_kit/services/main_app_sidekiq.yml`.
+* `kit attach` - Attach to POD_NAME. E.g. `kit attach -C community main-app-sidekiq-797646db88-7s4g7`
+* `kit compile IMAGE_NAMES` - Compile image with IMAGE_NAMES (comma-separated), and pushes to registry. Does not launch service. E.g. `kit compile -C community main_app_sidekiq`
+* `kit console POD_NAME` - Attach to POD_NAME & launch bin/console. E.g. `kit console -C community main-app-sidekiq-797646db88-7s4g7`
+* `kit deploy` - Deploy all services
+* `kit env ENV_FILE_NAME` - Return content of Env File ENV_FILE_NAME, where ENV_FILE_NAME artifact added by `KuberKit.add_env_file` in config files. E.g. `kit env -C community env_rke_community`
+* `kit help [COMMAND]` - Describe available commands or one specific command
+* `kit logs POD_NAME` - Show logs for POD_NAME. E.g. `kit logs -C community main-app-sidekiq-797646db88-7s4g7`
+* `kit service SERVICE_NAME` - Return content of Service. E.g. `kit service -C community main_app_sidekiq`
+* `kit template TEMPLATE_NAME` - Return content of Template. E.g. `kit template -C community web_app`
+* `kit version` - Print current version
+
+### Deploy Specific services
+
+* `kit deploy -t blogging` - Deploy all services with tag blogging
+* `kit deploy -s blogging_app` - Deploy service with name blogging_app
+* `kit deploy -s *_app` - Deploy all services with name ending `_app`
+* `kit deploy -t blogging -s ^*_app` - Deploy all services with tag blogging, except ones ending with `_app`
+
 ## Development
 
 ### Launch compilation

data/lib/kuber_kit/actions/configuration_loader.rb

@@ -42,9 +42,11 @@ class KuberKit::Actions::ConfigurationLoader
     load_configurations(configurations_path, configuration_name)
     load_infrastructure(infra_path)
 
-    if load_inventory
+    if load_inventory || KuberKit.current_configuration.kubeconfig_path.is_a?(KuberKit::Core::ArtifactPath)
       update_artifacts(KuberKit.current_configuration.artifacts.values)
+    end
 
+    if load_inventory
       ui.create_task("Loading image definitions") do |task|
         files = image_store.load_definitions(images_path)
 

data/lib/kuber_kit/actions/kubectl_env.rb

@@ -1,5 +1,6 @@
 class KuberKit::Actions::KubectlEnv
   include KuberKit::Import[
+    "core.artifact_path_resolver",
     "shell.local_shell",
     "ui"
   ]
@@ -8,6 +9,11 @@ class KuberKit::Actions::KubectlEnv
   def call(options)
     configuration   = KuberKit.current_configuration
     kubeconfig_path = configuration.kubeconfig_path
+
+    if kubeconfig_path.is_a?(KuberKit::Core::ArtifactPath)
+      kubeconfig_path = artifact_path_resolver.call(kubeconfig_path)
+    end
+
     ui.print_info("ENV", "export KUBECONFIG=#{kubeconfig_path}")
 
     true

data/lib/kuber_kit/actions/service_deployer.rb

@@ -17,9 +17,10 @@ class KuberKit::Actions::ServiceDeployer
     tags:                 Maybe[ArrayOf[String]],
     skip_services:        Maybe[ArrayOf[String]],
     skip_compile:         Maybe[Bool],
+    skip_dependencies:    Maybe[Bool],
     require_confirmation: Maybe[Bool],
   ] => Any
-  def call(services:, tags:, skip_services: nil, skip_compile: false, require_confirmation: false)
+  def call(services:, tags:, skip_services: nil, skip_compile: false, skip_dependencies: false, require_confirmation: false)
     deployment_result     = KuberKit::Actions::ActionResult.new()
     current_configuration = KuberKit.current_configuration
 
@@ -30,7 +31,6 @@ class KuberKit::Actions::ServiceDeployer
     default_services  = current_configuration.default_services.map(&:to_s)
     disabled_services = current_configuration.disabled_services.map(&:to_s)
     disabled_services += skip_services if skip_services
-    
 
     service_names = service_list_resolver.resolve(
       services:         services || [],
@@ -41,7 +41,11 @@ class KuberKit::Actions::ServiceDeployer
     ).map(&:to_sym)
 
     # Return the list of services with all dependencies.
-    all_service_names = service_dependency_resolver.get_all(service_names)
+    if skip_dependencies
+      all_service_names = service_names
+    else
+      all_service_names = service_dependency_resolver.get_all(service_names)
+    end
 
     unless all_service_names.any?
       ui.print_warning "ServiceDeployer", "No service found with given options, nothing will be deployed."
@@ -60,11 +64,21 @@ class KuberKit::Actions::ServiceDeployer
       return false unless compilation_result && compilation_result.succeeded?
     end
 
-    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}")
+    if skip_dependencies
+      service_names.each_slice(configs.deploy_simultaneous_limit) do |batch_service_names|
+        ui.print_debug("ServiceDeployer", "Scheduling to compile: #{batch_service_names.inspect}. Limit: #{configs.deploy_simultaneous_limit}")
+
+        if deployment_result.succeeded?
+          deploy_simultaneously(batch_service_names, deployment_result)
+        end
+      end
+    else
+      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}")
 
-      if deployment_result.succeeded?
-        deploy_simultaneously(dep_service_names, deployment_result)
+        if deployment_result.succeeded?
+          deploy_simultaneously(dep_service_names, deployment_result)
+        end
       end
     end
 

data/lib/kuber_kit/cli.rb

@@ -39,6 +39,7 @@ class KuberKit::CLI < Thor
   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 :skip_dependencies,     :type => :boolean,  aliases: ["-D"]
   method_option :require_confirmation,  :type => :boolean,  aliases: ["-r"]
   def deploy
     setup(options)
@@ -53,6 +54,7 @@ class KuberKit::CLI < Thor
         tags:                 (options[:tags] || []).flatten.uniq,
         skip_services:        (options[:skip_services] || []).flatten.uniq, 
         skip_compile:         options[:skip_compile] || false,
+        skip_dependencies:    options[:skip_dependencies] || false,
         require_confirmation: require_confirmation
       )
     end

data/lib/kuber_kit/container.rb

@@ -61,6 +61,10 @@ class KuberKit::Container
     KuberKit::Configs.new
   end
 
+  register "core.artifact_path_resolver" do
+    KuberKit::Core::ArtifactPathResolver.new
+  end
+
   register "core.image_factory" do
     KuberKit::Core::ImageFactory.new
   end

data/lib/kuber_kit/core/artifact_path.rb

@@ -0,0 +1,8 @@
+class KuberKit::Core::ArtifactPath
+  attr_reader :artifact_name, :file_path
+
+  def initialize(artifact_name:, file_path:)
+    @artifact_name = artifact_name
+    @file_path     = file_path
+  end
+end

data/lib/kuber_kit/core/artifact_path_resolver.rb

@@ -0,0 +1,13 @@
+class KuberKit::Core::ArtifactPathResolver < KuberKit::EnvFileReader::Strategies::Abstract
+  include KuberKit::Import[
+    "core.artifact_store"
+  ]
+
+  Contract KuberKit::Core::ArtifactPath => String
+  def call(artifact_path)
+    artifact = artifact_store.get(artifact_path.artifact_name)
+
+    file_parts = [artifact.cloned_path, artifact_path.file_path].compact
+    File.join(*file_parts)
+  end
+end

data/lib/kuber_kit/core/configuration.rb

@@ -10,7 +10,7 @@ class KuberKit::Core::Configuration
     registries:           Hash,
     env_files:            Hash,
     templates:            Hash,
-    kubeconfig_path:      Maybe[String],
+    kubeconfig_path:      Maybe[Or[String, KuberKit::Core::ArtifactPath]],
     services_attributes:  HashOf[Symbol => Hash],
     enabled_services:     ArrayOf[Symbol],
     disabled_services:    ArrayOf[Symbol],

data/lib/kuber_kit/service_deployer/service_list_resolver.rb

@@ -43,7 +43,7 @@ class KuberKit::ServiceDeployer::ServiceListResolver
     end
 
     if included_services.any?
-      included_services += default_services
+      included_services = default_services + included_services
     end
 
     included_services

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

@@ -2,8 +2,24 @@ require 'json'
 require 'shellwords'
 
 class KuberKit::Shell::Commands::KubectlCommands
+  include KuberKit::Import[
+    "core.artifact_path_resolver"
+  ]
+
+  Contract KuberKit::Shell::AbstractShell, Or[String, ArrayOf[String]], KeywordArgs[
+    kubeconfig_path: Maybe[Or[
+      String, KuberKit::Core::ArtifactPath
+    ]],
+    namespace:       Maybe[String],
+    interactive:     Optional[Bool],
+  ] => Any
   def kubectl_run(shell, command_list, kubeconfig_path: nil, namespace: nil, interactive: false)
     command_parts = []
+
+    if kubeconfig_path.is_a?(KuberKit::Core::ArtifactPath)
+      kubeconfig_path = artifact_path_resolver.call(kubeconfig_path)
+    end
+
     if kubeconfig_path
       command_parts << "KUBECONFIG=#{kubeconfig_path}"
     end
@@ -41,11 +57,11 @@ class KuberKit::Shell::Commands::KubectlCommands
   end
 
   def logs(shell, pod_name, args: nil, kubeconfig_path: nil, namespace: nil)
-    kubectl_run(shell, ["logs", args, pod_name], kubeconfig_path: kubeconfig_path, interactive: true, namespace: namespace)
+    kubectl_run(shell, ["logs", args, pod_name].compact, kubeconfig_path: kubeconfig_path, interactive: true, namespace: namespace)
   end
 
   def describe(shell, resource_name, args: nil, kubeconfig_path: nil, namespace: nil)
-    kubectl_run(shell, ["describe", args, resource_name], kubeconfig_path: kubeconfig_path, interactive: true, namespace: namespace)
+    kubectl_run(shell, ["describe", args, resource_name].compact, kubeconfig_path: kubeconfig_path, interactive: true, namespace: namespace)
   end
 
   def get_resources(shell, resource_type, field_selector: nil, jsonpath: ".items[*].metadata.name", kubeconfig_path: nil, namespace: nil)

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.7.1"
+  VERSION = "0.8.3"
 end

data/lib/kuber_kit.rb

@@ -13,6 +13,9 @@ module KuberKit
   NotFoundError = Class.new(Error)
   
   module Core
+    autoload :ArtifactPath, 'core/artifact_path'
+    autoload :ArtifactPathResolver, 'core/artifact_path_resolver'
+
     autoload :ImageDefinition, 'core/image_definition'
     autoload :ImageDefinitionFactory, 'core/image_definition_factory'
     autoload :ImageStore, 'core/image_store'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.3
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts
@@ -255,6 +255,8 @@ files:
 - lib/kuber_kit/cli.rb
 - lib/kuber_kit/configs.rb
 - lib/kuber_kit/container.rb
+- lib/kuber_kit/core/artifact_path.rb
+- lib/kuber_kit/core/artifact_path_resolver.rb
 - lib/kuber_kit/core/artifacts/abstract_artifact.rb
 - lib/kuber_kit/core/artifacts/artifact_store.rb
 - lib/kuber_kit/core/artifacts/git.rb