seira 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48543d46e562c460bb07cd4e5264b381a9f8f290416fc9b49ed72f857c0082d9
-  data.tar.gz: 14866aed401685a325be5f8687ac799be8028a2607537ea7c0634331af7f9ad6
+  metadata.gz: 78ba9d18d0744eaa4f13efb9e1301a716f3b6ac39a2918dfe39c8f00d159cdac
+  data.tar.gz: c8a603326969f48c4a7e907c3848833bbe40d2c0197aee57492a6a606625b054
 SHA512:
-  metadata.gz: 867599d8ef0343d263432f3c0faac188864eb0df28bacbb381238669df373c9d9d5c5a9d2ec7dd02a633bbae40b7ba2559db8ee41a094f71c8ceb541d7a8b2d0
-  data.tar.gz: 2a8e70e9c427e1f718d85f538b1df7c0909e942e87cec9c575e9ee64a9560b2b7cd3a2bc2b801e5ab47d3a6d18f2245afdd6d0943ea9f2a4a3ac180853b043cf
+  metadata.gz: 71da810729d57a4db2b64db4abc0bff54dc32962d2c0796da5951c7c5dda962d57107124026079b9725373d7ca013783a806aecc45c6ae7210c0eb974583dcbe
+  data.tar.gz: 5be8d22be54bdd01c9fca06467b832c9002ed1a809352759ee9b05368d5e943c09c5ef8c4a17512b5affda29661bdd05734e60b3671e7377c936c7c56ece71c1

data/lib/seira/jobs.rb

@@ -113,18 +113,29 @@ module Seira
       source = "kubernetes/#{context[:cluster]}/#{app}" # TODO: Move to method in app.rb
       Dir.mktmpdir do |destination|
         revision = ENV['REVISION']
-        file_name = "template.yaml"
+        file_name = discover_job_template_file_name(source)
 
         FileUtils.mkdir_p destination # Create the nested directory
         FileUtils.copy_file "#{source}/jobs/#{file_name}", "#{destination}/#{file_name}"
 
         # TOOD: Move this into a method since it is copied from app.rb
         text = File.read("#{destination}/#{file_name}")
+
+        # First run it through ERB if it should be
+        if file_name.end_with?('.erb')
+          locals = {}.merge(replacement_hash)
+          renderer = Seira::Util::ResourceRenderer.new(template: text, context: context, locals: locals)
+          text = renderer.render
+        end
+
         new_contents = text
         replacement_hash.each do |key, value|
           new_contents.gsub!(key, value)
         end
-        File.open("#{destination}/#{file_name}", 'w') { |file| file.write(new_contents) }
+
+        target_name = file_name.gsub('.erb', '')
+
+        File.open("#{destination}/#{target_name}", 'w') { |file| file.write(new_contents) }
 
         kubectl("apply -f #{destination}", context: context)
         log_link = Helpers.log_link(context: context, query: unique_name)
@@ -162,5 +173,13 @@ module Seira
         exit(1) unless status == "succeeded"
       end
     end
+
+    def discover_job_template_file_name(source)
+      if File.exist?("#{source}/jobs/template.yaml.erb")
+        "template.yaml.erb"
+      else
+        "template.yaml"
+      end
+    end
   end
 end

data/lib/seira/util/resource_renderer.rb

@@ -37,6 +37,16 @@ module Seira
         count
       end
 
+      def get_secret(secret_name)
+        secret_value = Seira::Helpers.get_secret(key: secret_name, context: @context)
+        @summary[secret_name] = 'fetched'
+
+        # Validate we actually get something back
+        fail "Missing value for secret #{secret_name}" unless secret_value
+
+        secret_value
+      end
+
       def target_revision
         rv = @locals['REVISION']
         @summary["revision"] = rv

data/lib/seira/version.rb

@@ -1,3 +1,3 @@
 module Seira
-  VERSION = "0.4.8".freeze
+  VERSION = "0.4.9".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seira
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Scott Ringwelski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline