kuber_kit 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20a7ebca76e47e6820df5cf6781c3d890f5a019f86d68b18220886820e2ba1dc
-  data.tar.gz: 6998805195d116612b2db4c56b519ba030b80ab942e4260f0fde23033833a5ec
+  metadata.gz: 2c4c480432ebb2d98461e9549271f26e607e3790464fde89b30631a675e9bc85
+  data.tar.gz: 04b4f46724bd31dd72467ffa0f073dd495dcaafecc7213ca57a6c70bbce1e4f7
 SHA512:
-  metadata.gz: 8271032fa486583c67cf83eea3a1d19a6796ea7667fad1e46f534ba4dc93457276be0df5070af131e44879a8d9dfcc6c0baf06bbbd9909c70000e60f816b79ae
-  data.tar.gz: ae36ec4cd5163f7ddd9394d56069200fac1fb60d7775e67f533ff639a0fe24098e92e07387727289f6b4d24f97656bdee7c1b9ec694b0ebf128734ec1107783a
+  metadata.gz: ef5601a6e9bd63a49154f6ae14ce77eebcbc0702bd89578fd413ec23226f7db0c37b60cffcd20d314bf1cfbd6fb98a8e050f9912be668aa3dce31dd6a5056cae
+  data.tar.gz: 7b17416b8b1d98b706409b1b88c44679b61f1689bf6c38d449320789d843f8f9b74dd519e61af364639e9cf78e95e28fd6499817980e2d211a85f0bd98d0b210

data/Gemfile.lock

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

data/TODO.md

@@ -1,3 +1,4 @@
-- service factory should make sure that service exists
+- rename service reader to service config reader
+- service factory should make sure that template exists
 - add build servers support
 - add build vars support (use images instead of containers)

data/example/app_data/service.yml

@@ -1,7 +1,25 @@
-apiVersion: v1
-kind: Service
+
+apiVersion: apps/v1
+kind: Deployment
 metadata:
-  name: "<%= service_uri %>"
+  labels:
+    app: <%= service_uri %>
+  name: <%= service_uri %>
 spec:
+  replicas: 1
   selector:
-    app: test-app
+    matchLabels:
+      app: <%= service_uri %>
+  strategy: {}
+  template:
+    metadata:
+      labels:
+        app: <%= service_uri %>
+    spec:
+      containers:
+      - name: <%= service_uri %>
+        image: <%= service_name %>:latest
+        imagePullPolicy: Always
+      restartPolicy: Always
+      imagePullSecrets:
+        - name: regcred

data/example/services/ruby_app.rb

@@ -0,0 +1,3 @@
+KuberKit
+  .define_service(:ruby_app)
+  .template(:service)

data/lib/kuber_kit.rb

@@ -116,8 +116,14 @@ module KuberKit
 
   module ServiceDeployer
     autoload :Deployer, 'service_deployer/deployer'
+    autoload :ServiceRestarter, 'service_deployer/service_restarter'
     autoload :ServiceReader, 'service_deployer/service_reader'
     autoload :ServiceListResolver, 'service_deployer/service_list_resolver'
+
+    module Strategies
+      autoload :Abstract, 'service_deployer/strategies/abstract'
+      autoload :Kubernetes, 'service_deployer/strategies/kubernetes'
+    end
   end
 
   module Actions

data/lib/kuber_kit/actions/service_deployer.rb

@@ -3,6 +3,7 @@ class KuberKit::Actions::ServiceDeployer
     "service_deployer.service_list_resolver",
     "service_deployer.deployer",
     "shell.local_shell",
+    "tools.logger",
     "ui"
   ]
 
@@ -15,8 +16,20 @@ class KuberKit::Actions::ServiceDeployer
       services: services || [],
       tags:     tags || []
     )
+
+    task_group = ui.create_task_group
+
     service_names.each do |service_name|
-      deployer.deploy(local_shell, service_name.to_sym)
+
+      logger.info("Started deploying: #{service_name.to_s.green}")
+      task_group.add("Deploying #{service_name.to_s.yellow}") do |task|
+        deployer.deploy(local_shell, service_name.to_sym)
+
+        task.update_title("Deployed #{service_name.to_s.green}")
+        logger.info("Finished deploying: #{service_name.to_s.green}")
+      end
     end
+
+    task_group.wait
   end
 end

data/lib/kuber_kit/configs.rb

@@ -21,11 +21,12 @@ class KuberKit::Configs
   CONFIGURATIONS_DIRNAME = "configurations".freeze
   ARTIFACT_CLONE_DIR     = "/tmp/kuber_kit/artifacts"
   SERVICE_CONFIG_DIR     = "/tmp/kuber_kit/services"
+  DEPLOY_STRATEGY        = :kubernetes
 
   attr_accessor :image_dockerfile_name, :image_build_context_dir, :image_tag,
                 :docker_ignore_list, :image_compile_dir, 
                 :kuber_kit_dirname, :images_dirname, :services_dirname, :infra_dirname, :configurations_dirname,
-                :artifact_clone_dir, :service_config_dir
+                :artifact_clone_dir, :service_config_dir, :deploy_strategy
 
   def initialize
     @image_dockerfile_name   = IMAGE_DOCKERFILE_NAME
@@ -40,5 +41,6 @@ class KuberKit::Configs
     @configurations_dirname  = CONFIGURATIONS_DIRNAME
     @artifact_clone_dir      = ARTIFACT_CLONE_DIR
     @service_config_dir      = SERVICE_CONFIG_DIR
+    @deploy_strategy         = DEPLOY_STRATEGY
   end
 end

data/lib/kuber_kit/container.rb

@@ -193,6 +193,10 @@ class KuberKit::Container
     KuberKit::ServiceDeployer::Deployer.new
   end
 
+  register "service_deployer.service_restarter" do
+    KuberKit::ServiceDeployer::ServiceRestarter.new
+  end
+
   register "service_deployer.service_reader" do
     KuberKit::ServiceDeployer::ServiceReader.new
   end
@@ -201,6 +205,10 @@ class KuberKit::Container
     KuberKit::ServiceDeployer::ServiceListResolver.new
   end
 
+  register "service_deployer.strategies.kubernetes" do
+    KuberKit::ServiceDeployer::Strategies::Kubernetes.new
+  end
+
   register "ui" do
     if KuberKit.debug_mode?
       KuberKit::UI::Simple.new

data/lib/kuber_kit/core/configuration.rb

@@ -1,5 +1,5 @@
 class KuberKit::Core::Configuration
-  attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubecfg_path
+  attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubecfg_path, :deploy_strategy
 
   Contract KeywordArgs[
     name:            Symbol,
@@ -7,14 +7,16 @@ class KuberKit::Core::Configuration
     registries:      Hash,
     env_files:       Hash,
     templates:       Hash,
-    kubecfg_path:    Maybe[String]
+    kubecfg_path:    Maybe[String],
+    deploy_strategy: Symbol
   ] => Any
-  def initialize(name:, artifacts:, registries:, env_files:, templates:, kubecfg_path:)
-    @name       = name
-    @artifacts  = artifacts
-    @registries = registries
-    @env_files  = env_files
-    @templates  = templates
-    @kubecfg_path = kubecfg_path
+  def initialize(name:, artifacts:, registries:, env_files:, templates:, kubecfg_path:, deploy_strategy:)
+    @name           = name
+    @artifacts      = artifacts
+    @registries     = registries
+    @env_files      = env_files
+    @templates      = templates
+    @kubecfg_path   = kubecfg_path
+    @deploy_strategy = deploy_strategy
   end
 end

data/lib/kuber_kit/core/configuration_definition.rb

@@ -14,12 +14,13 @@ class KuberKit::Core::ConfigurationDefinition
 
   def to_attrs
     OpenStruct.new(
-      name:          @configuration_name,
-      artifacts:     @artifacts,
-      registries:    @registries,
-      env_files:     @env_files,
-      templates:     @templates,
-      kubecfg_path:  @kubecfg_path
+      name:             @configuration_name,
+      artifacts:        @artifacts,
+      registries:       @registries,
+      env_files:        @env_files,
+      templates:        @templates,
+      kubecfg_path:     @kubecfg_path,
+      deploy_strategy:  @deploy_strategy
     )
   end
 
@@ -64,4 +65,10 @@ class KuberKit::Core::ConfigurationDefinition
 
     self
   end
+
+  def deploy_strategy(path)
+    @deploy_strategy = path
+
+    self
+  end
 end

data/lib/kuber_kit/core/configuration_factory.rb

@@ -5,7 +5,8 @@ class KuberKit::Core::ConfigurationFactory
     "core.registry_store",
     "core.artifact_store",
     "core.env_file_store",
-    "core.template_store"
+    "core.template_store",
+    "configs"
   ]
 
   def create(definition)
@@ -17,12 +18,13 @@ class KuberKit::Core::ConfigurationFactory
     templates  = fetch_templates(configuration_attrs.templates)
 
     KuberKit::Core::Configuration.new(
-      name:           configuration_attrs.name,
-      artifacts:      artifacts,
-      registries:     registries,
-      env_files:      env_files,
-      templates:      templates,
-      kubecfg_path:   configuration_attrs.kubecfg_path
+      name:             configuration_attrs.name,
+      artifacts:        artifacts,
+      registries:       registries,
+      env_files:        env_files,
+      templates:        templates,
+      kubecfg_path:     configuration_attrs.kubecfg_path,
+      deploy_strategy:  configuration_attrs.deploy_strategy || configs.deploy_strategy
     )
   end
 

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

@@ -1,4 +1,6 @@
 class KuberKit::Core::ContextHelper::BaseHelper
+  CONTRACT = RespondTo[:get_binding]
+
   attr_reader :shell, :artifact_store, :image_store
 
   def initialize(image_store:, artifact_store:, shell:)

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

@@ -13,7 +13,6 @@ class KuberKit::Core::ContextHelper::ServiceHelper < KuberKit::Core::ContextHelp
   end
 
   def service_uri
-    service_name
-      .sub("_", "-")
+    @service.uri
   end
 end

data/lib/kuber_kit/core/service.rb

@@ -11,4 +11,8 @@ class KuberKit::Core::Service
     @template_name = template_name
     @tags = tags
   end
+
+  def uri
+    name.to_s.sub("_", "-")
+  end
 end

data/lib/kuber_kit/image_compiler/compiler.rb

@@ -15,7 +15,7 @@ class KuberKit::ImageCompiler::Compiler
     context_helper = context_helper_factory.build_image_context(shell)
     image_build_dir_creator.create(shell, image, image_build_dir, context_helper: context_helper)
 
-    image_builder.build(shell, image, image_build_dir, context_helper: context_helper, args: [])
+    image_builder.build(shell, image, image_build_dir, context_helper: context_helper)
     image_build_dir_creator.cleanup(shell, image_build_dir)
   end
 end

data/lib/kuber_kit/image_compiler/image_builder.rb

@@ -5,10 +5,9 @@ class KuberKit::ImageCompiler::ImageBuilder
   ]
 
   Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Image, String, KeywordArgs[
-    args: Maybe[Any],
-    context_helper: Maybe[KuberKit::Core::ContextHelper]
+    context_helper: Maybe[KuberKit::Core::ContextHelper::BaseHelper::CONTRACT]
   ] => Any
-  def build(shell, image, build_dir, context_helper: nil, args: [])
+  def build(shell, image, build_dir, context_helper: nil)
     image.before_build_callback.call(context_helper, build_dir) if image.before_build_callback
 
     docker_commands.build(shell, build_dir, ["-t=#{image.registry_url}"])

data/lib/kuber_kit/service_deployer/deployer.rb

@@ -1,19 +1,15 @@
 class KuberKit::ServiceDeployer::Deployer
   include KuberKit::Import[
+    "service_deployer.service_restarter",
     "core.service_store",
-    "service_deployer.service_reader",
-    "shell.kubectl_commands",
-    "configs",
   ]
 
+  Contract KuberKit::Shell::AbstractShell, Symbol => Any
   def deploy(shell, service_name)
     service = service_store.get_service(service_name)
-    kubecfg_path = KuberKit.current_configuration.kubecfg_path
 
-    result = service_reader.read(shell, service)
-    file_path = "#{configs.service_config_dir}/#{service.name}.yml"
-    shell.write(file_path, result)
+    strategy_name = KuberKit.current_configuration.deploy_strategy
 
-    kubectl_commands.apply_file(shell, file_path, kubecfg_path: kubecfg_path)
+    service_restarter.restart(shell, service, strategy_name)
   end
 end

data/lib/kuber_kit/service_deployer/service_reader.rb

@@ -6,6 +6,7 @@ class KuberKit::ServiceDeployer::ServiceReader
     "preprocessing.text_preprocessor"
   ]
 
+  Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service => Any
   def read(shell, service)
     template = template_store.get(service.template_name)
 

data/lib/kuber_kit/service_deployer/service_restarter.rb

@@ -0,0 +1,37 @@
+class KuberKit::ServiceDeployer::ServiceRestarter
+  StrategyNotFoundError = Class.new(KuberKit::NotFoundError)
+
+  include KuberKit::Import[
+    "core.service_store",
+    "service_deployer.strategies.kubernetes"
+  ]
+
+  def register_strategy(strategy_name, strategy)
+    @@strategies ||= {}
+
+    if !strategy.is_a?(KuberKit::ServiceDeployer::Strategies::Abstract)
+      raise ArgumentError.new("should be an instance of KuberKit::ServiceDeployer::Strategies::Abstract, got: #{strategy.inspect}")
+    end
+
+    @@strategies[strategy_name] = strategy
+  end
+
+  Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service, Symbol => Any
+  def restart(shell, service, strategy_name)
+    add_default_strategies
+
+    restarter = @@strategies[strategy_name]
+
+    raise StrategyNotFoundError, "Can't find strategy with name #{strategy_name}" if restarter.nil?
+
+    restarter.restart(shell, service)
+  end
+
+  def add_default_strategies
+    register_strategy(:kubernetes, kubernetes)
+  end
+
+  def reset!
+    @@strategies = {}
+  end
+end

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

@@ -0,0 +1,5 @@
+class KuberKit::ServiceDeployer::Strategies::Abstract
+  def restart(shell, service)
+    raise KuberKit::NotImplementedError, "must be implemented"
+  end
+end

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

@@ -0,0 +1,18 @@
+class KuberKit::ServiceDeployer::Strategies::Kubernetes < KuberKit::ServiceDeployer::Strategies::Abstract
+  include KuberKit::Import[
+    "service_deployer.service_reader",
+    "shell.kubectl_commands",
+    "configs",
+  ]
+
+  Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service => Any
+  def restart(shell, service)
+    service_config = service_reader.read(shell, service)
+    config_path    = "#{configs.service_config_dir}/#{service.name}.yml"
+    shell.write(config_path, service_config)
+
+    kubecfg_path = KuberKit.current_configuration.kubecfg_path
+    kubectl_commands.apply_file(shell, config_path, kubecfg_path: kubecfg_path)
+    kubectl_commands.rolling_restart(shell, service.uri, kubecfg_path: kubecfg_path)
+  end
+end

data/lib/kuber_kit/shell/kubectl_commands.rb

@@ -1,3 +1,6 @@
+require 'json'
+require 'shellwords'
+
 class KuberKit::Shell::KubectlCommands
   def apply_file(shell, file_path, kubecfg_path: nil)
     command_parts = []
@@ -9,4 +12,31 @@ class KuberKit::Shell::KubectlCommands
 
     shell.exec!(command_parts.join(" "))
   end
+
+  def rolling_restart(shell, deployment_name, kubecfg_path: nil)
+    patch_deployment(shell, deployment_name, {
+      spec: {
+        template: {
+          metadata: {
+            labels: {
+              redeploy: "$(date +%s)"
+            }
+          }
+        }
+      }
+    }, kubecfg_path: kubecfg_path)
+  end
+
+  def patch_deployment(shell, deployment_name, specs, kubecfg_path: nil)
+    command_parts = []
+    if kubecfg_path
+      command_parts << "KUBECFG=#{kubecfg_path}"
+    end
+
+    specs_json = JSON.dump(specs).gsub('"', '\"')
+
+    command_parts << %Q{kubectl patch deployment #{deployment_name} -p "#{specs_json}"}
+
+    shell.exec!(command_parts.join(" "))
+  end
 end

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Iskander Khaziev
@@ -163,7 +163,7 @@ files:
 - example/infrastructure/env_files.rb
 - example/infrastructure/registries.rb
 - example/infrastructure/templates.rb
-- example/services/auth_app.rb
+- example/services/ruby_app.rb
 - kuber_kit.gemspec
 - lib/kuber_kit.rb
 - lib/kuber_kit/actions/configuration_loader.rb
@@ -230,6 +230,9 @@ files:
 - lib/kuber_kit/service_deployer/deployer.rb
 - lib/kuber_kit/service_deployer/service_list_resolver.rb
 - lib/kuber_kit/service_deployer/service_reader.rb
+- lib/kuber_kit/service_deployer/service_restarter.rb
+- lib/kuber_kit/service_deployer/strategies/abstract.rb
+- lib/kuber_kit/service_deployer/strategies/kubernetes.rb
 - lib/kuber_kit/shell/abstract_shell.rb
 - lib/kuber_kit/shell/bash_commands.rb
 - lib/kuber_kit/shell/command_counter.rb

data/example/services/auth_app.rb

@@ -1,3 +0,0 @@
-KuberKit
-  .define_service(:auth_app)
-  .template(:service)