kuber_kit 0.7.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5c29f15c515fba96ece8e78533644f3a43a1d2549302599f745c676dedd47c5
-  data.tar.gz: dccbbc6c69d0cdfbb27dfb3f9ded0bdd1efb3609f1b8ba5fe1580d4cf65ed42b
+  metadata.gz: 7d37959e170cf0ae0f88daa765fed03f52d3df930a05f8130fccbd2d6b68468d
+  data.tar.gz: 89610ec982168e4bad20d1688b792d60f95174e9a3d8d420bc7a257db6889b86
 SHA512:
-  metadata.gz: 110f8df5c9fa5767ee82ce03b5e482b96ba43f0394a7cc8349888df086adb663a68858fe49154c83913fc7a8be935a0494e84cf617a332f69e4553edc234024c
-  data.tar.gz: c1800c82bb31e7b17d12b033317ebffa554eee238c66d10141603ad42817ceb314cfd12cf01b4ccc010f701e9a3424a72ed10f2ed2611c7339e9a83d5ae45821
+  metadata.gz: f6d6dbe6c69bb428b7b528bcfed76d1619abd1b8253bd2a2c069a657e487db6444cdfa65a6ec8e896bb691b688dcb4a5dfcd1a024bf657c29ad77b0eb40b5cc5
+  data.tar.gz: 758e908ce338e9effb8d9e1740e200ee69b64b22154436c6548635eca3ffcd39c1ee634c94850741cecb629558a875055afc85434ba45adeccecc29e209a8f3e

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-**0.7.0**
+**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/kuber_kit.gemspec

@@ -23,13 +23,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  if RUBY_VERSION >= '3.0.0'
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
     spec.add_dependency "contracts", '0.17.0'
   else
     spec.add_dependency "contracts", '0.16.0'
   end
 
-  if RUBY_VERSION >= '2.6.0'
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6.0')
     spec.add_dependency "dry-auto_inject", "~> 0.8.0"
   else
     spec.add_dependency "dry-auto_inject", "~> 0.7.0"
@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "net-ssh"
   spec.add_dependency "tty-prompt"
   spec.add_dependency "dry-container", "~> 0.7.2"
+  spec.add_dependency "dry-configurable", "~> 0.12.1"
 
   spec.add_development_dependency "bundler", "~> 2.2"
   spec.add_development_dependency "rake", "~> 10.0"

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/artifacts_sync/artifact_updater.rb

@@ -2,9 +2,6 @@ class KuberKit::ArtifactsSync::ArtifactUpdater
   ResolverNotFoundError = Class.new(KuberKit::NotFoundError)
 
   include KuberKit::Import[
-    "artifacts_sync.git_artifact_resolver",
-    "artifacts_sync.null_artifact_resolver",
-
     "ui"
   ]
 
@@ -19,8 +16,6 @@ class KuberKit::ArtifactsSync::ArtifactUpdater
   end
 
   def update(shell, artifact)
-    add_default_resolvers
-
     resolver = @@resolvers[artifact.class]
 
     ui.print_debug "ArtifactUpdater", "Updating artifact #{artifact.name.to_s.green}"
@@ -29,13 +24,4 @@ class KuberKit::ArtifactsSync::ArtifactUpdater
 
     resolver.resolve(shell, artifact)
   end
-
-  def add_default_resolvers
-    use_resolver(git_artifact_resolver, artifact_class: KuberKit::Core::Artifacts::Git)
-    use_resolver(null_artifact_resolver, artifact_class: KuberKit::Core::Artifacts::Local)
-  end
-
-  def reset!
-    @@resolvers = {}
-  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/defaults.rb

@@ -0,0 +1,32 @@
+class KuberKit::Defaults
+  class << self
+    def init
+      return if @_initialized
+      @_initialized = true
+      init!
+    end
+
+    def init!
+      KuberKit::Container["artifacts_sync.artifact_updater"].use_resolver(
+        KuberKit::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"], 
+        artifact_class: KuberKit::Core::Artifacts::Local
+      )
+      KuberKit::Container["env_file_reader.reader"].use_reader(
+        KuberKit::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"], 
+        env_file_class: KuberKit::Core::EnvFiles::EnvGroup
+      )
+      KuberKit::Container["template_reader.reader"].use_reader(
+        KuberKit::Container["template_reader.strategies.artifact_file"], 
+        template_class: KuberKit::Core::Templates::ArtifactFile
+      )
+    end
+  end
+end

data/lib/kuber_kit/env_file_reader/reader.rb

@@ -1,16 +1,6 @@
 class KuberKit::EnvFileReader::Reader
   ReaderNotFoundError = Class.new(KuberKit::NotFoundError)
-
-  include KuberKit::Import[
-    "env_file_reader.strategies.artifact_file",
-    "env_file_reader.strategies.env_group",
-  ]
-
-  def initialize(**injected_deps, &block)
-    super(**injected_deps)
-    add_default_strategies
-  end
-
+  
   def use_reader(env_file_reader, env_file_class:)
     @@readers ||= {}
 
@@ -28,14 +18,4 @@ class KuberKit::EnvFileReader::Reader
 
     reader.read(shell, env_file)
   end
-
-  def reset!
-    @@readers = {}
-  end
-
-  private
-    def add_default_strategies
-      use_reader(artifact_file, env_file_class: KuberKit::Core::EnvFiles::ArtifactFile)
-      use_reader(env_group, env_file_class: KuberKit::Core::EnvFiles::EnvGroup)
-    end
 end

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,9 +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
+      if kubeconfig_path.is_a?(KuberKit::Core::ArtifactPath)
+        kubeconfig_path = artifact_path_resolver.call(kubeconfig_path)
+      end
       command_parts << "KUBECONFIG=#{kubeconfig_path}"
     end
 
@@ -41,11 +56,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/template_reader/reader.rb

@@ -1,15 +1,6 @@
 class KuberKit::TemplateReader::Reader
   ReaderNotFoundError = Class.new(KuberKit::NotFoundError)
 
-  include KuberKit::Import[
-    "template_reader.strategies.artifact_file",
-  ]
-
-  def initialize(**injected_deps, &block)
-    super(**injected_deps)
-    add_default_strategies
-  end
-
   def use_reader(template_reader, template_class:)
     @@readers ||= {}
 
@@ -27,13 +18,4 @@ class KuberKit::TemplateReader::Reader
 
     reader.read(shell, template)
   end
-
-  def reset!
-    @@readers = {}
-  end
-
-  private
-    def add_default_strategies
-      use_reader(artifact_file, template_class: KuberKit::Core::Templates::ArtifactFile)
-    end
 end

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.7.0"
+  VERSION = "0.8.2"
 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'
@@ -208,6 +211,7 @@ module KuberKit
   autoload :CLI, 'cli'
   autoload :Container, 'container'
   autoload :Configs, 'configs'
+  autoload :Defaults, 'defaults'
 
   Import = Dry::AutoInject(Container)
 
@@ -297,4 +301,6 @@ module KuberKit
   end
 end
 
+KuberKit::Defaults.init
+
 require 'kuber_kit/extensions/indocker_compat'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-28 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.2
+- !ruby/object:Gem::Dependency
+  name: dry-configurable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -241,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
@@ -280,6 +296,7 @@ files:
 - lib/kuber_kit/core/templates/abstract_template.rb
 - lib/kuber_kit/core/templates/artifact_file.rb
 - lib/kuber_kit/core/templates/template_store.rb
+- lib/kuber_kit/defaults.rb
 - lib/kuber_kit/env_file_reader/action_handler.rb
 - lib/kuber_kit/env_file_reader/env_file_parser.rb
 - lib/kuber_kit/env_file_reader/env_file_tempfile_creator.rb