kuber_kit 1.2.7 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd7d5abd9465de05ab9c906588764edf855660b2ce2866d41d36ee5bbcf222a0
-  data.tar.gz: beb7e47b16c3076ade6b34de4e8c41806b832aad291db2b58a651407db53f768
+  metadata.gz: 31078802fb9b9050b29675dd4b364c667ea7dc0f554b395144166fa2b7e0ffce
+  data.tar.gz: 585c56af43570387ee0ceb0985d0ceb2cbac7a4d5627103be1471f6757d2eabd
 SHA512:
-  metadata.gz: da1808570e50ca73338d5055c41405d7f950a6d329d5cbe4663afe6ff9381f000c3339205407be0ee5437be1e4aafcfa3da7fdb5abb97ae6405616be44a27932
-  data.tar.gz: 3deccb2c4b267f3222b8bf1235c12406ef0df0100782c2f645deabeffd104da02be461079243a8d6aed607188a0086653815bcaca053a1b219d6c361ac756d91
+  metadata.gz: 50a194368b224a8b35a6b24a9a22897a9ed0c891eb6888fee5f9c3e788d4114618647b18a6cffe31772cff641b2ee37361bb02cc14838eb18ea1ecd5b1fab3dd
+  data.tar.gz: dc9c31daed2206895a685aec0737656f387d9d08726f5897a8fb5b89bcce254683231b809ccf75b5b4e4a88ca39cb65ec41b2a688513ac559dd842510f09e823

data/.ruby-version

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

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+**1.3.1**
+- Fix upgrade command for helm strategy
+
+**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
 

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/defaults.rb

@@ -39,6 +39,10 @@ class KuberKit::Defaults
         :docker_compose,
         KuberKit::ServiceDeployer::Strategies::DockerCompose.new
       )
+      container["service_deployer.deployer"].register_strategy(
+        :helm,
+        KuberKit::ServiceDeployer::Strategies::Helm.new
+      )
 
       container["shell_launcher.launcher"].register_strategy(
         :kubernetes,

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, service.uri, 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.7"
+  VERSION = "1.3.1"
 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.7
+  version: 1.3.1
 platform: ruby
 authors:
 - Iskander Khaziev
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-17 00:00:00.000000000 Z
+date: 2023-08-15 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: []