kubernetes-deploy 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe05ac43ce5668b78154fd7cc4e5c62d44513de0
-  data.tar.gz: 67cf8f77d37ec6b3c9ba1cbf73bc4c7185e4e7a0
+  metadata.gz: f2098811abec5fdb6147e4a50ac43ed38f8c6595
+  data.tar.gz: a4cccb2a49f08a40ec5a5f09124c2e87400e8f16
 SHA512:
-  metadata.gz: 9a9503f71c75a1640c46e42ef007ca942218553c68a05718c4892e162daaf7b18eb5a05b216337a2cdaced51a1ecdcad20a5845820348af58576cbb8375e630e
-  data.tar.gz: 70d15573a44990b7b2e819569165f553a120f90bf7f57277118e7df63f678646a2c7afa77b92043597eb20f823b546a47e1ea5060a99259a7fdf75f4486a1aae
+  metadata.gz: 0764c379377b2ea2487eb927259e26c29019a13a19c270b770178b27b48d2933de5be049a92e9a490d555c4aec16e4265b8d0ee249fc6bd159a79254f54af5f7
+  data.tar.gz: 98610e19e49b68a0bce88e79c14472bc40f72bf3e7220baedb9853bf3935ff63e9f806d3c1f20b37d2f9d44694e67836ac634ce924fd1387a92c7e3e252dccb4

data/exe/kubernetes-deploy

@@ -15,18 +15,28 @@ require 'kubernetes-deploy'
 require 'optparse'
 
 skip_wait = false
+template_dir = nil
 ARGV.options do |opts|
-  opts.on("-w", "--skip-wait") { skip_wait = true }
+  opts.on("--skip-wait") { skip_wait = true }
+  opts.on("--template-dir=DIR") { |v| template_dir = v }
   opts.parse!
 end
 
+if !template_dir && ENV.key?("ENVIRONMENT")
+  template_dir = "config/deploy/#{ENV["ENVIRONMENT"]}"
+end
+
+if !template_dir || template_dir.empty?
+  puts "Template directory is unknown. Either specify --template-dir argument or set $ENVIRONMENT to use config/deploy/$ENVIRONMENT as a default path."
+  exit 1
+end
+
 KubernetesDeploy::Runner.with_friendly_errors do
   runner = KubernetesDeploy::Runner.new(
     namespace: ARGV[0],
     context: ARGV[1],
-    environment: ENV['ENVIRONMENT'],
     current_sha: ENV['REVISION'],
-    template_folder: ENV['K8S_TEMPLATE_FOLDER'],
+    template_dir: template_dir,
     wait_for_completion: !skip_wait,
   )
   runner.run

data/lib/kubernetes-deploy/runner.rb

@@ -55,11 +55,12 @@ MSG
       exit 1
     end
 
-    def initialize(namespace:, environment:, current_sha:, context:, wait_for_completion:, template_folder: nil)
+    def initialize(namespace:, current_sha:, context:, wait_for_completion:, template_dir:)
       @namespace = namespace
       @context = context
       @current_sha = current_sha
-      @template_path = File.expand_path('./' + (template_folder || "config/deploy/#{environment}"))
+
+      @template_dir = File.expand_path(template_dir)
       # Max length of podname is only 63chars so try to save some room by truncating sha to 8 chars
       @id = current_sha[0...8] + "-#{SecureRandom.hex(4)}" if current_sha
       @wait_for_completion = wait_for_completion
@@ -119,7 +120,7 @@ MSG
 
     def discover_resources
       resources = []
-      Dir.foreach(@template_path) do |filename|
+      Dir.foreach(@template_dir) do |filename|
         next unless filename.end_with?(".yml.erb", ".yml")
 
         split_templates(filename) do |tempfile|
@@ -139,7 +140,7 @@ MSG
     end
 
     def split_templates(filename)
-      file_content = File.read(File.join(@template_path, filename))
+      file_content = File.read(File.join(@template_dir, filename))
       rendered_content = render_template(filename, file_content)
       YAML.load_stream(rendered_content) do |doc|
         f = Tempfile.new(filename)
@@ -201,10 +202,10 @@ MSG
         errors << "Current SHA must be specified"
       end
 
-      if !File.directory?(@template_path)
-        errors << "Template path #{@template_path} doesn't exist"
-      elsif Dir.entries(@template_path).none? { |file| file =~ /\.yml(\.erb)?$/ }
-        errors << "#{@template_path} doesn't contain valid templates (postfix .yml or .yml.erb)"
+      if !File.directory?(@template_dir)
+        errors << "Template directory `#{@template_dir}` doesn't exist"
+      elsif Dir.entries(@template_dir).none? { |file| file =~ /\.yml(\.erb)?$/ }
+        errors << "`#{@template_dir}` doesn't contain valid templates (postfix .yml or .yml.erb)"
       end
 
       if @namespace.blank?

data/lib/kubernetes-deploy/version.rb

@@ -1,3 +1,3 @@
 module KubernetesDeploy
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Kir Shatrov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport