minfra-cli 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba7dd8c8775a7ecedd048d2a6e6288727f86791bb0e3c9a97df882d29d10ddd1
-  data.tar.gz: 5a416953d916aff78611c5dcca45300434a54abb172aad5a5ad4118b9cb3206e
+  metadata.gz: 2b4880a484c8d4d18875f3b3c355162c0f49eb1fcae69f8a870ee4c5ad8d04d0
+  data.tar.gz: 1d34cb69b8b8e5a5476dcec8d14463d02a00a2fbdc47ccb12f761a93413a3df9
 SHA512:
-  metadata.gz: 1a0ab85e07b00c652cf41b94cff07cc327801d55f19eefe97a0d7301a2e0a8262196df760785fc6ef7ccd3d56e44deed3441260a868d4916266cb143b8c9d68e
-  data.tar.gz: 36a5f383251c4e6ae0f583f99e08606f07c1c6df198c721718d5dea1b2b9f1fab4629c7b99ee5950dd18a823148226b10bea2e558bfb5ce02c08ce800be3f7a5
+  metadata.gz: 851fbc24107b2efd086f2e69adaaf2580f1ceed98eee55a71067348d4283360be440b14bf94b586f56a3a5180d0432a76553602cad02b6aef3e2715441bef236
+  data.tar.gz: cffdcda6203c63f9efcc12b7f57dea382caf82f2a2cd8cca605c14b36ef8fe77a82695c72a8cddac31113c311f24fc753de8df7506a03894474d83d360b282ee

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.12.0
+ * refactoring Runner
+ * adding runner type system (popen is default)
+ * adding HelmRunner, KubectlRunner
+ * adding support for infra::allow_insecure_k8s_connections
+ * easing active support requirement
+
 # 1.11.0
  * generating helm output with resolved vairables in "helm_expanded"
  * adding template_dir to templater to render whole directories

data/lib/minfra/cli/commands/kube.rb

@@ -15,7 +15,10 @@ module Minfra
 
       def dashboard(stack_name,env,deployment,cluster)
         stack = init(stack_name,env,deployment,cluster)
-        exec("k9s --kubeconfig #{kube_config_path} --context #{stack.cluster_name} --namespace #{stack_name} --command pod")
+        insecure_flag = l("infra::allow_insecure_k8s_connections") ? "--insecure-skip-tls-verify" : ""
+        cmd = "k9s #{insecure_flag} --kubeconfig #{kube_config_path} --context #{stack.cluster_name} --namespace #{stack_name} --command pod"
+        debug(cmd)
+        exec(cmd)
       end
 
       def restart
@@ -154,9 +157,7 @@ module Minfra
 
         extra_args = extra_args.join(' ')
 
-        cmd = "helm --kube-context #{cluster} rollback #{options[:stack]} #{extra_args}"
-        #puts cmd
-        run_cmd(cmd, :exec)
+        run_helm("--kube-context #{cluster} rollback #{options[:stack]} #{extra_args}")
       end
 
       def list
@@ -195,9 +196,9 @@ module Minfra
 
         cluster = stack.cluster_name
         if [resource, implicit_resource].include?('pod') && ['delete', 'describe', 'exec', 'logs', 'port-forward'].include?(subcommand)
-          cmd_get_pods = "kubectl --kubeconfig #{kube_config_path} --context #{cluster} --namespace #{options[:stack]} get pod -o jsonpath='{range .items[*]}{.metadata.name}{\"\\n\"}'"
+          cmd_get_pods = "--kubeconfig #{kube_config_path} --context #{cluster} --namespace #{options[:stack]} get pod -o jsonpath='{range .items[*]}{.metadata.name}{\"\\n\"}'"
 
-          pods_list = run_cmd(cmd_get_pods).split("\n")
+          pods_list = run_kubectl(cmd_get_pods).stdout_lines
 
           fuzzy_pod_name = args.shift
 
@@ -230,9 +231,8 @@ module Minfra
 
         extra_args = extra_args.join(' ')
 
-        cmd = "kubectl --kubeconfig #{kube_config_path} --context #{cluster} --namespace #{options[:stack]} #{subcommand} #{resource} #{pod_name} #{extra_args}"
-        # puts cmd
-        run_cmd(cmd, :exec)
+        cmd = "--kubeconfig #{kube_config_path} --context #{cluster} --namespace #{options[:stack]} #{subcommand} #{resource} #{pod_name} #{extra_args}"
+        KubeCtlRunner.run(cmd, runner: :exec)
       end
 
       private
@@ -252,13 +252,11 @@ module Minfra
       end
 
       def run_kubectl(cmd)
-        #        run(%{kubectl --kubeconfig #{kube_config_path} #{cmd}})
-        run(%{kubectl #{cmd}})
+        KubeCtlRunner.run(cmd, runner: :system)
       end
 
       def run_helm(cmd)
-#        run(%{helm --kubeconfig #{kube_config_path} --home #{helm_path} #{cmd}})
-        run(%{helm #{cmd}})
+        HelmRunner.run(cmd, runner: :system)
       end
 
       def helm_path

data/lib/minfra/cli/helm_runner.rb

@@ -0,0 +1,11 @@
+module Minfra
+  module Cli
+    class HelmRunner < Runner
+      def initialize(cmd, **args)
+        insecure_flag = l("infra::allow_insecure_k8s_connections") ? "--kube-insecure-skip-tls-verify" : ""
+        cmd = "helm #{insecure_flag} #{cmd}"
+        super(cmd, **args)
+      end
+    end
+  end
+end

data/lib/minfra/cli/kubectl_runner.rb

@@ -0,0 +1,11 @@
+module Minfra
+  module Cli
+    class KubeCtlRunner < Runner
+      def initialize(cmd, **args)
+        insecure_flag = l("infra::allow_insecure_k8s_connections") ? "--insecure-skip-tls-verify" : ""
+        cmd = "kubectl #{insecure_flag} #{cmd}"
+        super(cmd, **args)
+      end
+    end
+  end
+end

data/lib/minfra/cli/runner.rb

@@ -11,6 +11,8 @@ module Minfra
 
         attr_writer :status
 
+        attr_reader :stdout_lines
+        
         def initialize
           @stderr_lines = []
           @stdout_lines = []
@@ -58,18 +60,58 @@ module Minfra
         new(cmd, **args).run
       end
 
-      attr_reader :exit_on_error
+      attr_reader :exit_on_error, :runner, :cmd
 
-      def initialize(cmd, exit_on_error: true)
+      def initialize(cmd, exit_on_error: true, runner: :popen)
         @cmd = cmd
         @exit_on_error = exit_on_error
+        @runner = runner
       end
 
       def run
-        debug("running: #{@cmd}")
-        res = nil
+        debug("running (#{@runner}): #{@cmd}")
+        res=case @runner
+          when :system
+            run_system(Result.new)
+          when :popen  
+            run_threaded(Result.new)
+          when :exec
+            run_exec(Result.new)  
+          else
+            raise "unknown runner #{@runner}"  
+        end
+        
+        if res.error?
+          error "command failed: #{@cmd}"
+          debug  res.stdout
+          info  res.stderr
+        end
+        if exit_on_error && res.error?
+          info "command exiting on error (#{res.exitstatus})"
+          exit 1
+        end
+        res
+      end
+      
+      private
+
+      def run_exec(_res)
+        exec(@cmd)
+      end
+      # you don't get stderr .... yet
+      def run_system(res)
+        #https://stackoverflow.com/questions/6338908/ruby-difference-between-exec-system-and-x-or-backticks
+        begin
+          out=`#{@cmd}`
+          out.each_line do |line| res.add(line, :stdout) end 
+        rescue StandardError
+        end
+        res.status = $?
+        res
+      end
+      
+      def run_threaded(res)
         begin
-          res = Result.new
           # see: http://stackoverflow.com/a/1162850/83386
           # the whole implementation is problematic as we migth miss some output lines
           # Open4 might be a solution. Using Select might be a solution. Using Process.fork might be a solution....
@@ -91,18 +133,9 @@ module Minfra
           end
         rescue StandardError
         end
-
-        if res.error?
-          error "command failed: #{@cmd}"
-          debug  res.stdout
-          info  res.stderr
-        end
-        if exit_on_error && res.error?
-          info "command exiting on error (#{res.exitstatus})"
-          exit 1
-        end
         res
       end
+      
     end
   end
 end

data/lib/minfra/cli/version.rb

@@ -1,5 +1,5 @@
 module Minfra
   module Cli
-    VERSION = '1.11.0'.freeze
+    VERSION = '1.12.0'.freeze
   end
 end

data/lib/minfra/cli.rb

@@ -16,6 +16,8 @@ require_relative 'cli/command'
 require_relative 'cli/ask'
 require_relative 'cli/document'
 require_relative 'cli/runner'
+require_relative 'cli/helm_runner'
+require_relative 'cli/kubectl_runner'
 require_relative 'cli/plugins'
 
 require 'active_support'

data/lib/orchparty/kubernetes_application.rb

@@ -47,8 +47,8 @@ module Orchparty
 
       def print_install(helm)
         @out_io.puts "---"
-        @out_io.puts install_cmd(helm, value_path(helm))
-        @out_io.puts upgrade_cmd(helm, value_path(helm))
+        @out_io.puts install_cmd(helm, value_path(helm)).cmd
+        @out_io.puts upgrade_cmd(helm, value_path(helm)).cmd
         @out_io.puts "---"
         @out_io.puts File.read(template(value_path(helm), helm, flag: "")) if value_path(helm)
       end
@@ -60,11 +60,11 @@ module Orchparty
       end
 
       def upgrade(helm)
-        @out_io.puts system(upgrade_cmd(helm))
+        @out_io.puts upgrade_cmd(helm).run.stdout
       end
 
       def install(helm)
-        @out_io.puts system(install_cmd(helm))
+        @out_io.puts install_cmd(helm).run.stdout
       end
     end
 
@@ -74,11 +74,11 @@ module Orchparty
       end
 
       def upgrade_cmd(helm, fix_file_path = nil)
-        "helm upgrade --namespace #{namespace} --kube-context #{cluster_name} --version #{helm.version} #{helm.name} #{helm.chart} #{template(value_path(helm), helm, fix_file_path: fix_file_path)}"
+        Minfra::Cli::HelmRunner.new("upgrade --namespace #{namespace} --kube-context #{cluster_name} --version #{helm.version} #{helm.name} #{helm.chart} #{template(value_path(helm), helm, fix_file_path: fix_file_path)}")
       end
 
       def install_cmd(helm, fix_file_path = nil)
-        "helm install --create-namespace --namespace #{namespace} --kube-context #{cluster_name} --version #{helm.version} #{helm.name} #{helm.chart} #{template(value_path(helm), helm, fix_file_path: fix_file_path)}"
+        Minfra::Cli::HelmRunner.new("install --create-namespace --namespace #{namespace} --kube-context #{cluster_name} --version #{helm.version} #{helm.name} #{helm.chart} #{template(value_path(helm), helm, fix_file_path: fix_file_path)}")
       end
     end
 
@@ -163,9 +163,10 @@ module Orchparty
       def print_install(chart)
         
         build_chart(chart) do |chart_path|
-          cmd="helm template --namespace #{namespace} --debug --kube-context #{cluster_name} --output-dir #{chart_path.join('..','helm_expanded')}   #{chart.name} #{chart_path}"
-          @out_io.puts `$cmd`
-          if system("#{cmd} > /dev/null")
+           cmd="helm template --namespace #{namespace} --debug --kube-context #{cluster_name} --output-dir #{chart_path.join('..','helm_expanded')}   #{chart.name} #{chart_path}"
+           @out_io.puts `$cmd`
+           if system("#{cmd} > /dev/null")
+
             info("helm template check: OK")
           else
             error("helm template check: FAIL")
@@ -181,21 +182,21 @@ module Orchparty
       def install(chart)
         info("Install: #{chart.name}")
         build_chart(chart) do |chart_path|
-          @out_io.puts system("helm install --create-namespace --namespace #{namespace} --kube-context #{cluster_name} #{chart.name} #{chart_path}")
+          res=Minfra::Cli::HelmRunner.new("install --create-namespace --namespace #{namespace} --kube-context #{cluster_name} #{chart.name} #{chart_path}").run
+          @out_io.puts res.stdout
         end
       end
 
       def upgrade(chart)
         info("Upgrade: #{chart}")
         build_chart(chart) do |chart_path|
-          @out_io.puts system("helm upgrade --namespace #{namespace} --kube-context #{cluster_name} #{chart.name} #{chart_path}")
+          res=Minfra::Cli::HelmRunner.new("upgrade --namespace #{namespace} --kube-context #{cluster_name} #{chart.name} #{chart_path}").run
+          @out_io.puts res.stdout
         end
       end
       private
       
       def build_chart(chart)
-        
-        
         dir = @app.status_dir.join('helm') # duplication
         
         params = chart._services.map {|s| app_config.services[s.to_sym] }.map{|s| [s.name, s]}.to_h

data/minfra-cli.gemspec

@@ -31,9 +31,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "table_print", "1.5.6"
   spec.add_runtime_dependency "rest-client", "~>2.0"
   spec.add_runtime_dependency "hashie", "~>3.5"
-  spec.add_runtime_dependency "activesupport", "~> 6.1"
+  spec.add_runtime_dependency "activesupport", ">= 6.1"
   spec.add_runtime_dependency "erubis", "~> 2.7"
   spec.add_runtime_dependency "hiera", "3.9.0"
   spec.add_runtime_dependency "hiera-eyaml", "3.3.0"
   spec.add_runtime_dependency "hiera-eyaml-gpg", "0.7.4"
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-16 00:00:00.000000000 Z
+date: 2023-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -76,14 +76,14 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.1'
 - !ruby/object:Gem::Dependency
@@ -185,7 +185,9 @@ files:
 - lib/minfra/cli/common.rb
 - lib/minfra/cli/config.rb
 - lib/minfra/cli/document.rb
+- lib/minfra/cli/helm_runner.rb
 - lib/minfra/cli/hook.rb
+- lib/minfra/cli/kubectl_runner.rb
 - lib/minfra/cli/logging.rb
 - lib/minfra/cli/main_command.rb
 - lib/minfra/cli/plugins.rb
@@ -237,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: A cli framework for k8s based development and deployment.