kuber_kit 1.2.6 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 536f630ab67b2695dfcbde31648ae12a22445bf2918c415ce43984631dfaf27a
-  data.tar.gz: b2994f8e2cd1ccede7c9e18c0b519e7492f5548c3ac0a08ae73d17989ae050ef
+  metadata.gz: 6afb44a6d4d220f74b0254b1334eb8c1a54eaed3bb343ac701a88bc25f2afcaa
+  data.tar.gz: dde0f72facc6c08af028bc32ba2d024b1838e036836e94f2785695e43f948d96
 SHA512:
-  metadata.gz: a8c64a620e1c418c9079cec7e372ee025af8d694c42752584730b26f4839b559136247f21f172040c90c6c181b34d25a52698f73fe7962428f73d0f3d557498f
-  data.tar.gz: 5a5cc0c62d3f94c8bc91b90caa4e4c98c63cef520ce8b15d9d673cc5abc3e0067731cb492f1a9dc041a789d56f0b67cfafee25d1054eaa8acb3884bb15d51616
+  metadata.gz: 383427ada7a5ca0ecd9a6db9c6747ecdf830866d2a7ea890706b5201566fa8e4aa59b868b6b49c94ab3524c7f5d7f8e85a8ea137e9d8c973d825d8aef028f1dc
+  data.tar.gz: 66c2f065953353e283dc5986582e5d440b03c2e3e532dd70c717e91288aa15d99b872c1eb337b23dc9a4fd4873c72ded43dcd0fd5f630cf579ae76e01c652eeb

data/.ruby-version

@@ -1 +1 @@
-3.2.0
+3.2.2

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+**1.3.0**
+- Allow sending custom apply command for k8s deploy strategy
+- Added initial support for helm deploy strategy
+
+**1.2.7**
+- Added an option to skip deployment and only build images for `deploy` command
+
 **1.2.6**
 - Lock cli-ui version on 2.1.0 (2.2.x has some bugs)
 

data/lib/kuber_kit/actions/service_deployer.rb

@@ -18,9 +18,10 @@ class KuberKit::Actions::ServiceDeployer
     skip_services:        Maybe[ArrayOf[String]],
     skip_compile:         Maybe[Bool],
     skip_dependencies:    Maybe[Bool],
+    skip_deployment:      Maybe[Bool],
     require_confirmation: Maybe[Bool],
   ] => Any
-  def call(services:, tags:, skip_services: nil, skip_compile: false, skip_dependencies: false, require_confirmation: false)
+  def call(services:, tags:, skip_services: nil, skip_compile: false, skip_dependencies: false, skip_deployment: false, require_confirmation: false)
     deployment_result     = KuberKit::Actions::ActionResult.new()
     current_configuration = KuberKit.current_configuration
 
@@ -66,6 +67,11 @@ class KuberKit::Actions::ServiceDeployer
       return false unless compilation_result && compilation_result.succeeded?
     end
 
+    # Skip service deployment, only compile images.
+    if skip_deployment
+      return deployment_result
+    end
+
     # First deploy initial services. 
     # This feature is used to deploy some services, required for deployment of other services, e.g. env files
     # Note: Initial services are deployed without dependencies

data/lib/kuber_kit/cli.rb

@@ -43,6 +43,7 @@ class KuberKit::CLI < Thor
   method_option :skip_dependencies,     :type => :boolean,  aliases: ["-D"]
   method_option :require_confirmation,  :type => :boolean,  aliases: ["-r"]
   method_option :skip_confirmation,     :type => :boolean,  aliases: ["-R"]
+  method_option :skip_deployment,       :type => :boolean,  aliases: ["-K"]
   def deploy
     setup(options)
 
@@ -58,6 +59,7 @@ class KuberKit::CLI < Thor
         skip_services:        (options[:skip_services] || []).flatten.uniq, 
         skip_compile:         options[:skip_compile] || false,
         skip_dependencies:    options[:skip_dependencies] || false,
+        skip_deployment:      options[:skip_deployment] || false,
         require_confirmation: require_confirmation
       )
     end

data/lib/kuber_kit/container.rb

@@ -181,6 +181,10 @@ class KuberKit::Container
     KuberKit::Shell::Commands::SystemCommands.new
   end
 
+  register "shell.helm_commands" do
+    KuberKit::Shell::Commands::HelmCommands.new
+  end
+
   register "shell.local_shell" do
     KuberKit::Shell::LocalShell.new
   end

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

@@ -0,0 +1,41 @@
+class KuberKit::ServiceDeployer::Strategies::Helm < KuberKit::ServiceDeployer::Strategies::Abstract
+  include KuberKit::Import[
+    "service_reader.reader",
+    "shell.helm_commands",
+    "shell.bash_commands",
+    "configs",
+  ]
+
+  Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service => Any
+  def deploy(shell, service)
+    service_config        = reader.read(shell, service)
+    chart_root_path       = File.join(configs.service_config_dir, "#{service.name}_chart")
+    chart_templates_path  = File.join(chart_root_path, "templates")
+    chart_config_path = File.join(chart_root_path, "Chart.yaml")
+    release_path      = File.join(chart_templates_path, "release.yaml")
+
+    bash_commands.mkdir_p(shell, File.dirname(chart_root_path))
+    bash_commands.mkdir_p(shell, File.dirname(chart_templates_path))
+
+    shell.write(release_path, service_config)
+    shell.write(chart_config_path, chart_config_content(service.uri))
+
+    kubeconfig_path = KuberKit.current_configuration.kubeconfig_path
+    namespace       = KuberKit.current_configuration.deployer_namespace
+
+    upgrade_result = helm_commands.upgrade(shell, chart_root_path, kubeconfig_path: kubeconfig_path, namespace: namespace)
+    
+    upgrade_result
+  end
+
+  def chart_config_content(release_name)
+    query = <<-CHART
+apiVersion: v2
+name: #{release_name}
+description: #{release_name}
+type: application
+version: 1.0.0
+appVersion: "1.0.0"
+    CHART
+  end
+end

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

@@ -10,7 +10,8 @@ class KuberKit::ServiceDeployer::Strategies::Kubernetes < KuberKit::ServiceDeplo
     :resource_name,
     :delete_if_exists,
     :restart_if_exists,
-    :wait_for_rollout
+    :wait_for_rollout,
+    :apply_command
   ]
 
   Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service => Any
@@ -40,7 +41,12 @@ class KuberKit::ServiceDeployer::Strategies::Kubernetes < KuberKit::ServiceDeplo
       kubectl_commands.delete_resource(shell, resource_type, resource_name, kubeconfig_path: kubeconfig_path, namespace: namespace)
     end
 
-    apply_result = kubectl_commands.apply_file(shell, config_path, kubeconfig_path: kubeconfig_path, namespace: namespace)
+    apply_result = kubectl_commands.apply_file(
+      shell, config_path, 
+      kubeconfig_path: kubeconfig_path, 
+      namespace: namespace,
+      apply_command: strategy_options.fetch(:apply_command, "apply")
+    )
 
     restart_enabled  = strategy_options.fetch(:restart_if_exists, true)
     wait_for_rollout = strategy_options.fetch(:wait_for_rollout, true)

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

@@ -0,0 +1,42 @@
+class KuberKit::Shell::Commands::HelmCommands
+  Contract KuberKit::Shell::AbstractShell, Or[String, ArrayOf[String]], KeywordArgs[
+    kubeconfig_path: Maybe[Or[
+      String, KuberKit::Core::ArtifactPath
+    ]],
+    namespace:              Maybe[Or[Symbol, String]],
+    interactive:            Optional[Bool],
+  ] => Any
+  def helm_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
+
+    command_parts << "helm"
+
+    if namespace
+      command_parts << "-n #{namespace}"
+    end
+
+    command_parts += Array(command_list).compact
+
+    if interactive
+      shell.interactive!(command_parts.join(" "))
+    else
+      shell.exec!(command_parts.join(" "))
+    end
+  end
+
+  def install(shell, release_name, chart_path, kubeconfig_path: nil, namespace: nil)
+    helm_run(shell, "install #{release_name} #{chart_path}", kubeconfig_path: kubeconfig_path, namespace: namespace)
+  end
+
+  def upgrade(shell, release_name, chart_path, kubeconfig_path: nil, namespace: nil)
+    helm_run(shell, "upgrade #{release_name} #{chart_path} --install", kubeconfig_path: kubeconfig_path, namespace: namespace)
+  end
+end

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

@@ -39,8 +39,9 @@ class KuberKit::Shell::Commands::KubectlCommands
     end
   end
   
-  def apply_file(shell, file_path, kubeconfig_path: nil, namespace: nil)
-    kubectl_run(shell, "apply -f #{file_path}", kubeconfig_path: kubeconfig_path, namespace: namespace)
+  def apply_file(shell, file_path, kubeconfig_path: nil, namespace: nil, apply_command: nil)
+    apply_command ||= "apply"
+    kubectl_run(shell, "#{apply_command} -f #{file_path}", kubeconfig_path: kubeconfig_path, namespace: namespace)
   end
 
   def exec(shell, pod_name, command, args: nil, kubeconfig_path: nil, interactive: false, namespace: nil, entrypoint: nil)

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "1.2.6"
+  VERSION = "1.3.0"
 end

data/lib/kuber_kit.rb

@@ -104,6 +104,7 @@ module KuberKit
       autoload :RsyncCommands, 'shell/commands/rsync_commands'
       autoload :KubectlCommands, 'shell/commands/kubectl_commands'
       autoload :SystemCommands, 'shell/commands/system_commands'
+      autoload :HelmCommands, 'shell/commands/helm_commands'
     end
   end
 
@@ -166,6 +167,7 @@ module KuberKit
       autoload :Docker, 'service_deployer/strategies/docker'
       autoload :DockerCompose, 'service_deployer/strategies/docker_compose'
       autoload :Kubernetes, 'service_deployer/strategies/kubernetes'
+      autoload :Helm, 'service_deployer/strategies/helm'
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.0
 platform: ruby
 authors:
 - Iskander Khaziev
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-26 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts
@@ -343,6 +343,7 @@ files:
 - lib/kuber_kit/service_deployer/strategies/abstract.rb
 - lib/kuber_kit/service_deployer/strategies/docker.rb
 - lib/kuber_kit/service_deployer/strategies/docker_compose.rb
+- lib/kuber_kit/service_deployer/strategies/helm.rb
 - lib/kuber_kit/service_deployer/strategies/kubernetes.rb
 - lib/kuber_kit/service_deployer/strategy_detector.rb
 - lib/kuber_kit/service_reader/action_handler.rb
@@ -353,6 +354,7 @@ files:
 - lib/kuber_kit/shell/commands/docker_commands.rb
 - lib/kuber_kit/shell/commands/docker_compose_commands.rb
 - lib/kuber_kit/shell/commands/git_commands.rb
+- lib/kuber_kit/shell/commands/helm_commands.rb
 - lib/kuber_kit/shell/commands/kubectl_commands.rb
 - lib/kuber_kit/shell/commands/rsync_commands.rb
 - lib/kuber_kit/shell/commands/system_commands.rb
@@ -382,7 +384,7 @@ homepage: https://github.com/ArtStation/kuber_kit
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -397,8 +399,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: Docker Containers Build & Deployment
 test_files: []