kubernetes-deploy 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a581b73a9b59ce7dbc35a528acf269ba9ee12523
-  data.tar.gz: 4d3b6268317bf30b3011d1eb3e9f8bcc9c731c4f
+  metadata.gz: c1da3f74a75f658fb3fd6e31e3ba0a8aa113ad6a
+  data.tar.gz: f3d779d8ced5cb12260e039c47bdd9cf8106ce83
 SHA512:
-  metadata.gz: 15197ca3f8d90b28927dc8a5ab365bb7f455434c49af708db82b2f8f5dd7430420a8e4819edbc1d4579cd2291df0a002f11924be3a865631a11e5a1fa3f3b344
-  data.tar.gz: bae4f408b4bfad19e61754991f24bf34d48dca2929f1d33dbd592b2fcc009b7135adc3dc92201c1e8d7633d80520a798e03aedec45778d59d81aa0a872ab7426
+  metadata.gz: 6b29bb17f2c20c7c1353f57458c159c63c620f085bb7e0769a0565096c831c7503b92789ac7c7f36118e22cd41f49b0ce0e41392230bee85ac79a2230095cff2
+  data.tar.gz: c875779d47150ba2cd8c784622232651c029ec8a8c411d60763e2a73123c4b1d37d62afc801055dd9fac311e8722415f6c12ab9997592c5595eb7c994b024e7b

data/CHANGELOG.md

@@ -1,10 +1,16 @@
 ### Master
 
+### 0.20.1
 *Features*
 
 *Bug Fixes*
+- Display a nice error instead of crashing when a YAML document is missing 'Kind'
+([#280](https://github.com/Shopify/kubernetes-deploy/pull/280))
+- Prevent DaemonSet from succeeding before rollout finishes
+  ([#288](https://github.com/Shopify/kubernetes-deploy/issues/288))
 
 *Enhancements*
+- Merge multiple `--bindings` arguments, to allow a composite bindings map (multiple arguments or files)
 
 ### 0.20.0
 

data/exe/kubernetes-deploy

@@ -15,7 +15,7 @@ max_watch_seconds = nil
 ARGV.options do |opts|
   opts.on("--bindings=BINDINGS", "Expose additional variables to ERB templates " \
     "(format: k1=v1,k2=v2, JSON string or file (JSON or YAML) path prefixed by '@')") do |binds|
-    bindings = KubernetesDeploy::BindingsParser.parse(binds)
+    bindings.merge!(KubernetesDeploy::BindingsParser.parse(binds))
   end
 
   opts.on("--skip-wait", "Skip verification of non-priority-resource success (not recommended)") { skip_wait = true }

data/kubernetes-deploy.gemspec

@@ -24,8 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3.0'
   spec.add_dependency "activesupport", ">= 5.0"
-  spec.add_dependency "kubeclient", "~> 2.4"
-  spec.add_dependency "rest-client", ">= 1.7" # Minimum required by kubeclient. Remove when kubeclient releases v3.0.
+  spec.add_dependency "kubeclient", "~> 3.0"
   spec.add_dependency "googleauth", ">= 0.5"
   spec.add_dependency "ejson", "1.0.1"
   spec.add_dependency "colorize", "~> 0.8"

data/lib/kubernetes-deploy/deploy_task.rb

@@ -253,6 +253,7 @@ module KubernetesDeploy
         yield doc
       end
     rescue InvalidTemplateError => e
+      e.filename ||= filename
       record_invalid_template(err: e.message, filename: e.filename, content: e.content)
       raise FatalDeploymentError, "Failed to render and parse template"
     rescue Psych::SyntaxError => e

data/lib/kubernetes-deploy/errors.rb

@@ -4,8 +4,9 @@ module KubernetesDeploy
   class KubectlError < StandardError; end
 
   class InvalidTemplateError < FatalDeploymentError
-    attr_reader :filename, :content
-    def initialize(err, filename:, content: nil)
+    attr_reader :content
+    attr_accessor :filename
+    def initialize(err, filename: nil, content: nil)
       @filename = filename
       @content = content
       super(err)

data/lib/kubernetes-deploy/kubernetes_resource.rb

@@ -31,7 +31,9 @@ module KubernetesDeploy
       def build(namespace:, context:, definition:, logger:, statsd_tags:)
         opts = { namespace: namespace, context: context, definition: definition, logger: logger,
                  statsd_tags: statsd_tags }
-        if KubernetesDeploy.const_defined?(definition["kind"])
+        if definition["kind"].blank?
+          raise InvalidTemplateError.new("Template missing 'Kind'", content: definition.to_yaml)
+        elsif KubernetesDeploy.const_defined?(definition["kind"])
           klass = KubernetesDeploy.const_get(definition["kind"])
           klass.new(**opts)
         else

data/lib/kubernetes-deploy/kubernetes_resource/daemon_set.rb

@@ -18,7 +18,7 @@ module KubernetesDeploy
 
     def deploy_succeeded?
       return false unless exists?
-      rollout_data["desiredNumberScheduled"].to_i == rollout_data["currentNumberScheduled"].to_i &&
+      rollout_data["desiredNumberScheduled"].to_i == rollout_data["updatedNumberScheduled"].to_i &&
       rollout_data["desiredNumberScheduled"].to_i == rollout_data["numberReady"].to_i &&
       current_generation == observed_generation
     end
@@ -48,7 +48,7 @@ module KubernetesDeploy
     def rollout_data
       return { "currentNumberScheduled" => 0 } unless exists?
       @instance_data["status"]
-        .slice("currentNumberScheduled", "desiredNumberScheduled", "numberReady")
+        .slice("updatedNumberScheduled", "desiredNumberScheduled", "numberReady")
     end
 
     def parent_of_pod?(pod_data)

data/lib/kubernetes-deploy/kubernetes_resource/deployment.rb

@@ -74,6 +74,7 @@ module KubernetesDeploy
     end
 
     def deploy_timed_out?
+      return false if deploy_failed?
       # Do not use the hard timeout if progress deadline is set
       progress_condition.present? ? deploy_failing_to_progress? : super
     end

data/lib/kubernetes-deploy/restart_task.rb

@@ -131,11 +131,11 @@ module KubernetesDeploy
 
     def patch_kubeclient_deployments(deployments)
       deployments.each do |record|
-        response = patch_deployment_with_restart(record)
-        if HTTP_OK_RANGE.cover?(response.code)
+        begin
+          patch_deployment_with_restart(record)
           @logger.info "Triggered `#{record.metadata.name}` restart"
-        else
-          raise RestartAPIError.new(record.metadata.name, response)
+        rescue Kubeclient::ResourceNotFoundError, Kubeclient::HttpError => e
+          raise RestartAPIError.new(record.metadata.name, e.message)
         end
       end
     end

data/lib/kubernetes-deploy/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module KubernetesDeploy
-  VERSION = "0.20.0"
+  VERSION = "0.20.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-deploy
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Katrina Verey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,28 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement