minfra-cli 1.5.1 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e01ddd1aab00b59e77cca198cb41188270b77202f900afef2ea693029cc25bf
-  data.tar.gz: 44e3c6eb7d60db3a8cd3d55bb60793117bed96e0cc4b07c664275fc71bf38b49
+  metadata.gz: 0cee136b8311f1099c78490bfcf6da7be65e5fd8dc0cb029e8dc3828646e6631
+  data.tar.gz: 46d3929cc27282bc0ed1ac63c4db00c64a7e55e6dbd311319a29dff7d68ab403
 SHA512:
-  metadata.gz: 9d76c1b520371c53b90988283a19979f773ad955520ba82a7500de27918f6b52744c091305422a66ea96a982dd21052738344b799b300604b04bd52b2302a5dd
-  data.tar.gz: 437a304792db570235878164058a6cd12433d75e644ddec7f058fe5154bf9b955bf9613113d354e21b445a1bc96966b547f58ca7556d6ee0ba19154893905730
+  metadata.gz: 469d14ac4671707412d214cd24d7c682bbd5ea62a1ee23dc87d0512eab1ec4ca51223751cfab73c2e96f96ccdba20f25f1394b32d61dd57a231862c1ff3fa25b
+  data.tar.gz: 70f3bc9ea2ec6f6509d709a6c68969453335f47063086063194cb616aa5db6131b8af69377fe935c329f25df8cbd0096e9fbb9ae44fbfd9035c8be1640b1982a

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.6.1
+ * adding minfra_path to hiera scope
+ * fixing state preparation when state dir not yet there
+# 1.6.0
+ * collecting things in used_vars 
+ * no overwriting of values.yaml between each char (as the helm template dir is shared)
 # 1.5.1
  * fixing hiera lookup caching error
 # 1.5.0

data/bin/runner

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+if [[ -f "$MINFRA_PATH/config/env_setup" ]]; then
+  source $MINFRA_PATH/config/env_setup
+fi
+
+MINFRA_SHELL=${MINFRA_SHELL:-"/bin/bash"}
+CMD=${@:-$MINFRA_SHELL}
+
+echo "running: '$CMD'"
+
+exec $CMD
+

data/lib/minfra/cli/version.rb

@@ -1,5 +1,5 @@
 module Minfra
   module Cli
-    VERSION = '1.5.1'.freeze
+    VERSION = '1.6.1'.freeze
   end
 end

data/lib/minfra/cli.rb

@@ -2,10 +2,10 @@ require 'thor'
 require 'open3'
 require 'json'
 require 'ostruct'
-require 'orchparty'
 require 'hiera'
 
 require_relative 'cli/logging'
+require 'orchparty'
 require_relative 'cli/config'
 require_relative 'cli/version'
 require_relative 'cli/hook'
@@ -79,7 +79,7 @@ module Minfra
       hiera_main_path=@hiera_root.join("hieradata/#{config.project.minfra.hiera.env_path}/#{env}.eyaml")
       raise("unknown environment #{env}, I expact a file at #{hiera_main_path}") unless hiera_main_path.exist? 
 
-      scope={ "hieraroot" => @hiera_root.to_s, "env" => env}
+      scope={ "minfra_path" => ENV["MINFRA_PATH"], "hieraroot" => @hiera_root.to_s, "env" => env}
       special_lookups=hiera.lookup("lookup_options", {},  scope, nil, :priority)
       
       node_scope=hiera.lookup("env", {},  scope, nil, :deeper)

data/lib/orchparty/ast.rb

@@ -12,6 +12,18 @@ module Orchparty
       def get_binding
         binding
       end
+
+      def inspect(indent=0)
+        start="\n"
+        each_pair do |name, ast|
+          begin
+            start << "#{'  ' * indent}#{name}: #{ast.inspect(indent+1)}\n"
+          rescue ArgumentError
+            start << "#{'  ' * indent}#{name}: #{ast.inspect}\n"
+          end  
+        end
+        start
+      end
     end
 
     def self.hash(args = {})
@@ -49,5 +61,6 @@ module Orchparty
     def self.chart(args = {})
       Node.new(_mix:[], _variables: {}, _services: []).merge(args)
     end
+
   end
 end

data/lib/orchparty/kubernetes_application.rb

@@ -10,6 +10,8 @@ require 'active_support/core_ext'
 module Orchparty
   module Services
     class Context
+      include ::Minfra::Cli::Logging 
+
       attr_accessor :cluster_name
       attr_accessor :namespace
       attr_accessor :dir_path
@@ -157,35 +159,79 @@ module Orchparty
         end
       end
 
+
+      def print_install(chart)
+        
+        build_chart(chart) do |chart_path|
+          cmd="helm template --namespace #{namespace} --kube-context #{cluster_name} #{chart.name} #{chart_path}"
+          @out_io.puts `$cmd`
+          if system("#{cmd} > /dev/null")
+            info("helm template check: OK")
+          else
+            error("helm template check: FAIL")
+          end  
+        end
+        
+      end
+
+      def print_upgrade(chart)
+        print_install(chart)
+      end
+
+      def install(chart)
+        info("Install: #{chart}")
+        build_chart(chart) do |chart_path|
+          @out_io.puts system("helm install --create-namespace --namespace #{namespace} --kube-context #{cluster_name} #{chart.name} #{chart_path}")
+        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}")
+        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
-        dir = @app.status_dir.join('helm')
-        dir.mkpath
         run(templates_path: File.expand_path(chart.template, self.dir_path), params: params, output_chart_path: dir, chart: chart)
         yield dir
       end
 
-      def run(templates_path:, params:, output_chart_path:, chart: )
-        system("mkdir -p #{File.join(output_chart_path, 'templates')}")
 
-        system("cp #{File.join(templates_path, 'values.yaml')} #{File.join(output_chart_path, 'values.yaml')}")
-        system("cp #{File.join(templates_path, '.helmignore')} #{File.join(output_chart_path, '.helmignore')}")
-        system("cp #{File.join(templates_path, 'templates/_helpers.tpl')} #{File.join(output_chart_path, 'templates/_helpers.tpl')}")
+
+      # remember:
+      # this is done for an app
+      # that app can have multiple charts with multiple services!
+      
+      def run(templates_path:, params:, output_chart_path:, chart: )
 
         generate_chart_yaml(
           templates_path: templates_path,
           output_chart_path: output_chart_path,
           chart_name: chart.name,
         )
-        params.each do |app_name, subparams|
-          subparams[:chart] = chart
-          generate_documents_from_erbs(
-            templates_path: templates_path,
-            app_name: app_name,
-            params: subparams,
-            output_chart_path: output_chart_path
-          )
+        
+        File.open(File.join(output_chart_path, 'values.yaml'),'a') do |helm_values|
+          params.each do |app_name, subparams|
+            subparams[:chart] = chart
+            used_vars=generate_documents_from_erbs(
+              templates_path: templates_path,
+              app_name: app_name,
+              params: subparams,
+              output_chart_path: output_chart_path
+            )
+            used_vars.each do |variable,value| 
+              helm_values.puts "#{variable}: #{value}"
+            end
+          end
         end
+        
       end
 
       def generate_documents_from_erbs(templates_path:, app_name:, params:, output_chart_path:)
@@ -195,23 +241,28 @@ module Orchparty
         end
 
         kind = params.fetch(:kind)
+        params._used_vars = {} #here we'll collect all used vars
+
         Dir[File.join(templates_path, kind, '*.erb')].each do |template_path|
-          puts "Rendering Template: #{template_path}"
+          info("Rendering Template: #{template_path}")
           template_name = File.basename(template_path, '.erb')
           output_path = File.join(output_chart_path, 'templates', "#{app_name}-#{template_name}")
-
+          
           template = Erubis::Eruby.new(File.read(template_path))
           template.filename = template_path
+
+          params.app = @app
           params.app_name = app_name
           params.templates_path = templates_path
           begin
             document = template.result(CleanBinding.new.get_binding(params))
           rescue Exception
-            puts "#{template_path} has a problem: #{$!.inspect}"
+            error "#{template_path} has a problem: #{$!.inspect}"
             raise
           end
           File.write(output_path, document)
         end
+        params._used_vars
       end
 
       def generate_chart_yaml(templates_path:, output_chart_path:, chart_name: )
@@ -224,34 +275,13 @@ module Orchparty
         document = template.result(CleanBinding.new.get_binding(params))
         File.write(output_path, document)
       end
-
-      def print_install(chart)
-        build_chart(chart) do |chart_path|
-          @out_io.puts `helm template --namespace #{namespace} --kube-context #{cluster_name} #{chart.name} #{chart_path}`
-        end
-      end
-
-      def print_upgrade(chart)
-        print_install(chart)
-      end
-
-      def install(chart)
-        build_chart(chart) do |chart_path|
-          @out_io.puts system("helm install --create-namespace --namespace #{namespace} --kube-context #{cluster_name} #{chart.name} #{chart_path}")
-        end
-      end
-
-      def upgrade(chart)
-        build_chart(chart) do |chart_path|
-          system("cp -a #{chart_path} /tmp/latest-chart")
-          @out_io.puts system("helm upgrade --namespace #{namespace} --kube-context #{cluster_name} #{chart.name} #{chart_path}")
-        end
-      end
     end
   end
 end
 
 class KubernetesApplication
+  include Minfra::Cli::Logging
+
   attr_accessor :cluster_name
   attr_accessor :file_path
   attr_accessor :namespace
@@ -259,7 +289,7 @@ class KubernetesApplication
   attr_reader :status_dir
 
   def initialize(app_config: [], namespace:, cluster_name:, file_name:, status_dir:, out_io: STDOUT)
-    self.file_path = Pathname.new(file_name).parent.expand_path
+    self.file_path = Pathname.new(file_name).parent.expand_path #path of the stack
     self.cluster_name = cluster_name
     self.namespace = namespace
     self.app_config = app_config
@@ -279,6 +309,22 @@ class KubernetesApplication
     each_service("print_#{method}".to_sym)
   end
 
+  private
+  def prepare
+    output_chart_path = @status_dir.join('helm')
+    output_chart_path.rmtree if output_chart_path.exist?
+    output_chart_path.mkpath
+    templates_path = file_path.join('../../chart-templates').expand_path #don't ask. the whole concept of multiple charts in an app stinks...
+    
+    info("generating base helm structure from: #{output_chart_path} from #{templates_path}")
+    system("mkdir -p #{File.join(output_chart_path, 'templates')}")
+
+    system("cp #{File.join(templates_path, 'values.yaml')} #{File.join(output_chart_path, 'values.yaml')}")
+    system("cp #{File.join(templates_path, '.helmignore')} #{File.join(output_chart_path, '.helmignore')}")
+    system("cp #{File.join(templates_path, 'templates/_helpers.tpl')} #{File.join(output_chart_path, 'templates/_helpers.tpl')}")
+
+  end
+  
   def combine_charts(app_config)
     services = app_config._service_order.map(&:to_s)
     app_config._service_order.each do |name|
@@ -293,11 +339,20 @@ class KubernetesApplication
   end
 
   def each_service(method)
+    prepare
     services = combine_charts(app_config)
     services.each do |name|
       service = app_config[:services][name]
-      puts "Service: #{name}(#{service._type}) #{method}"
-      "::Orchparty::Services::#{service._type.classify}".constantize.new(cluster_name: cluster_name, namespace: namespace, file_path: file_path, app_config: app_config, out_io: @out_io, app: self).send(method, service)
+      info "Service: #{name}(#{service._type}) #{method}"
+      deployable_class="::Orchparty::Services::#{service._type.classify}".constantize
+      deployable=deployable_class.new(cluster_name: cluster_name, 
+                     namespace: namespace, 
+                     file_path: file_path, 
+                     app_config: app_config, 
+                     out_io: @out_io, 
+                     app: self)
+                     
+      deployable.send(method, service)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.1
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2023-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -162,6 +162,7 @@ files:
 - bin/console
 - bin/container_exec
 - bin/run_tests
+- bin/runner
 - bin/setup.sh
 - exe/minfra
 - lib/deep_merge.rb