minfra-cli 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cee136b8311f1099c78490bfcf6da7be65e5fd8dc0cb029e8dc3828646e6631
-  data.tar.gz: 46d3929cc27282bc0ed1ac63c4db00c64a7e55e6dbd311319a29dff7d68ab403
+  metadata.gz: b5f12534bfcd73e84a69435f5cd58d9884d595a90c387518a663621c2a03e17a
+  data.tar.gz: bd8bdc596ea6fef14fa55f187710b6841cd31df32447b76b63bf6bd4cf96e1ab
 SHA512:
-  metadata.gz: 469d14ac4671707412d214cd24d7c682bbd5ea62a1ee23dc87d0512eab1ec4ca51223751cfab73c2e96f96ccdba20f25f1394b32d61dd57a231862c1ff3fa25b
-  data.tar.gz: 70f3bc9ea2ec6f6509d709a6c68969453335f47063086063194cb616aa5db6131b8af69377fe935c329f25df8cbd0096e9fbb9ae44fbfd9035c8be1640b1982a
+  metadata.gz: a15f204d44ba8432ff2a36d73b3e5069689dcc3307bb036e6492bbbc01fbbe8aeeb3fec40d098d28199658d32c487e6c10bc7a9391800800556f5972ca80e5ca
+  data.tar.gz: 5dc1e214bf4a90d699c2cdbf47018c7966f303c4e990ff9aea1c5adaa09b7c50322ca34e765ae2f3b46fa2787e8609a0ee978e65a26eaee605875486c793cb25

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.6.2
+ * fixing templater 
+ * generating Chart.yaml only once with the namespaces name
 # 1.6.1
  * adding minfra_path to hiera scope
  * fixing state preparation when state dir not yet there

data/lib/minfra/cli/templater.rb

@@ -14,7 +14,7 @@ module Minfra
             raise "file #{path} not found"
           end
         end  
-        render(template, params)
+        render(content, params)
       end
       
       def self.render(template, params)

data/lib/minfra/cli/version.rb

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

data/lib/minfra/cli.rb

@@ -5,13 +5,14 @@ require 'ostruct'
 require 'hiera'
 
 require_relative 'cli/logging'
+require_relative 'cli/templater'
+
 require 'orchparty'
 require_relative 'cli/config'
 require_relative 'cli/version'
 require_relative 'cli/hook'
 require_relative 'cli/common'
 require_relative 'cli/command'
-require_relative 'cli/templater'
 require_relative 'cli/ask'
 require_relative 'cli/document'
 require_relative 'cli/runner'

data/lib/orchparty/kubernetes_application.rb

@@ -179,7 +179,7 @@ module Orchparty
       end
 
       def install(chart)
-        info("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}")
         end
@@ -211,11 +211,6 @@ module Orchparty
       
       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,
-        )
         
         File.open(File.join(output_chart_path, 'values.yaml'),'a') do |helm_values|
           params.each do |app_name, subparams|
@@ -265,16 +260,6 @@ module Orchparty
         params._used_vars
       end
 
-      def generate_chart_yaml(templates_path:, output_chart_path:, chart_name: )
-        template_path = File.join(templates_path, 'Chart.yaml.erb')
-        output_path = File.join(output_chart_path, 'Chart.yaml')
-
-        template = Erubis::Eruby.new(File.read(template_path))
-        template.filename = template_path
-        params = Hashie::Mash.new(chart_name: chart_name)
-        document = template.result(CleanBinding.new.get_binding(params))
-        File.write(output_path, document)
-      end
     end
   end
 end
@@ -311,11 +296,18 @@ class KubernetesApplication
 
   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...
     
+    generate_chart_yaml(
+          templates_path: templates_path,
+          output_chart_path: output_chart_path,
+          chart_name: namespace,
+    )
+
     info("generating base helm structure from: #{output_chart_path} from #{templates_path}")
     system("mkdir -p #{File.join(output_chart_path, 'templates')}")
 
@@ -324,6 +316,14 @@ class KubernetesApplication
     system("cp #{File.join(templates_path, 'templates/_helpers.tpl')} #{File.join(output_chart_path, 'templates/_helpers.tpl')}")
 
   end
+
+  def generate_chart_yaml(templates_path:, output_chart_path:, chart_name: )
+    template_path = File.join(templates_path, 'Chart.yaml.erb')
+    output_path = File.join(output_chart_path, 'Chart.yaml')
+
+    res=Minfra::Cli::Templater.read(template_path, params: {chart_name: chart_name})
+    File.write(output_path, res)
+  end
   
   def combine_charts(app_config)
     services = app_config._service_order.map(&:to_s)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minfra-cli
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Peter Schrammel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-03 00:00:00.000000000 Z
+date: 2023-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor