kubernetes-deploy 0.20.5 → 0.20.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b01e4098e730e6ee300284d185adb140cf3cdc80
-  data.tar.gz: 6416b255318a78d3a1b6383263bbecd7b3603a4b
+  metadata.gz: 5f4739131c95e48be2df66d1ca820fc63fa92a0f
+  data.tar.gz: ef6afd733102c00d3ac9b42571da84a1edde0970
 SHA512:
-  metadata.gz: aeeb95108945428fe39de942b7285843cd8a3960344089386bfbf1cfc1a551a50c1531d3e7d2082187f67640e6978ad1ab00f8ed7176b14d92bb56410ba78380
-  data.tar.gz: d0c1753242a3131586627252707ef9674ff94d2ac0e8e9f39f6a147dbc05449b5414ce6f26c1e8ede9bb4bd58d5919bf94ed6629f97ff2abc9db5c74e4b70e82
+  metadata.gz: a025aaf9b1e4cb4689e8ad0e4101502f460146f5dbe36ed1da096a5b53679e24cf75dbb5f84cbe1ec0b739988a0eafebe20237c69a51614d130b551b8456fbfa
+  data.tar.gz: 4364997f2d82b1b80530ba1c5c52797dd009e5a6ab882570df0937479200cd17099fb8ac9d99527bc98dd0dfa4b8859ca6a9bd4e075d25d2fe055c32ea0fd40c

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ### Master
 
+*Enhancements*
+
+## 0.20.6
+
+*Enhancements*
+- All resources marked as prunable will now be added to the prune whitelist ([#326](https://github.com/Shopify/kubernetes-deploy/pull/326))
+- Improve deploy status detection by ensuring we examine the correct generation ([#325](https://github.com/Shopify/kubernetes-deploy/pull/325))
+
+*Bug Fixes*
+
+## 0.20.5
 *Enhancements*
 - Add Job resource class ([#295](https://github.com/Shopify/kubernetes-deploy/pull/296))
 - Add CustomResourceDefinition resource class ([#306](https://github.com/Shopify/kubernetes-deploy/pull/306))
@@ -9,6 +20,9 @@ being tracked ([#316](https://github.com/Shopify/kubernetes-deploy/pull/316))
 - Allow CRs to be pruned based on `kubernetes-deploy.shopify.io/prunable` annotation on the custom resource definitions ([312](https://github.com/Shopify/kubernetes-deploy/pull/312))
 - Add HorizontalPodAutoscaler resource class ([#305](https://github.com/Shopify/kubernetes-deploy/pull/305))
 
+*Bug Fixes*
+- Prevent crash when STATSD_IMPLEMENTATION isn't set. ([#3242](https://github.com/Shopify/kubernetes-deploy/pull/324))
+
 ### 0.20.4
 *Enhancements*
 - Don't consider pod preempting a failure ([#317](https://github.com/shopify/kubernetes-deploy/pull/317))

data/README.md

@@ -180,7 +180,7 @@ Both `.yaml.erb` and `.yml.erb` file extensions are supported. Templates must re
 
 ##### Limitations when using partials
 
-Partials can be included almost everywhere in ERB templates, with one notable exception: you cannot use a partial to define a subset of fields. For example, given a partial `p` defining two fields 'a' and 'b',
+Partials can be included almost everywhere in ERB templates. Note: when using a partial to insert additional key-value pairs to a map you must use [YAML merge keys](http://yaml.org/type/merge.html). For example, given a partial `p` defining two fields 'a' and 'b',
 
 ```yaml
 a: 1
@@ -205,22 +205,8 @@ b: 2
 but you can do:
 
 ```yaml
-x:
-  <%= partial 'p' %>
-```
-
-or even
-
-```yaml
-x: <%= partial 'p' %>
-```
-
-which both will result in
-
-```yaml
-x:
-  a: 1
-  b: 2
+<<: <%= partial 'p' %>
+x: yz
 ```
 
 This is a limitation of the current implementation.

data/kubernetes-deploy.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport", ">= 5.0"
   spec.add_dependency "kubeclient", "~> 3.0"
   spec.add_dependency "googleauth", "= 0.6.2" # https://github.com/google/google-auth-library-ruby/issues/153
-  spec.add_dependency "ejson", "1.0.1"
+  spec.add_dependency "ejson", "~> 1.0"
   spec.add_dependency "colorize", "~> 0.8"
   spec.add_dependency "statsd-instrument", "~> 2.2"
 

data/lib/kubernetes-deploy/deploy_task.rb

@@ -82,6 +82,7 @@ module KubernetesDeploy
         extensions/v1beta1/Ingress
         apps/v1beta1/StatefulSet
         autoscaling/v1/HorizontalPodAutoscaler
+        policy/v1beta1/PodDisruptionBudget
       )
       if server_version >= Gem::Version.new('1.8.0')
         wl << "batch/v1beta1/CronJob"
@@ -359,6 +360,9 @@ module KubernetesDeploy
 
       # Apply can be done in one large batch, the rest have to be done individually
       applyables, individuals = resources.partition { |r| r.deploy_method == :apply }
+      # Prunable resources should also applied so that they can  be pruned
+      pruneable_types = prune_whitelist.map { |t| t.split("/").last }
+      applyables += individuals.select { |r| pruneable_types.include?(r.type) }
 
       individuals.each do |r|
         @logger.info("- #{r.id} (#{r.pretty_timeout_type})") if resources.length > 1

data/lib/kubernetes-deploy/kubernetes_resource.rb

@@ -139,6 +139,17 @@ module KubernetesDeploy
       @instance_data.present?
     end
 
+    def current_generation
+      return -1 unless exists? # must be different default than observed_generation
+      @instance_data["metadata"]["generation"]
+    end
+
+    def observed_generation
+      return -2 unless exists?
+      # populating this is a best practice, but not all controllers actually do it
+      @instance_data["status"]["observedGeneration"]
+    end
+
     def status
       exists? ? "Exists" : "Unknown"
     end

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

@@ -18,9 +18,5 @@ module KubernetesDeploy
     def deploy_failed?
       false
     end
-
-    def deploy_method
-      :replace
-    end
   end
 end

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

@@ -22,10 +22,6 @@ module KubernetesDeploy
       false
     end
 
-    def deploy_method
-      :replace
-    end
-
     private
 
     def proxy_deployment_ready?

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

@@ -24,7 +24,8 @@ module KubernetesDeploy
     end
 
     def deploy_failed?
-      pods.present? && pods.any?(&:deploy_failed?)
+      pods.present? && pods.any?(&:deploy_failed?) &&
+      observed_generation == current_generation
     end
 
     def fetch_logs(kubectl)
@@ -35,16 +36,6 @@ module KubernetesDeploy
 
     private
 
-    def current_generation
-      return -1 unless exists? # must be different default than observed_generation
-      @instance_data["metadata"]["generation"]
-    end
-
-    def observed_generation
-      return -2 unless exists?
-      @instance_data["status"]["observedGeneration"]
-    end
-
     def rollout_data
       return { "currentNumberScheduled" => 0 } unless exists?
       @instance_data["status"]

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

@@ -31,6 +31,7 @@ module KubernetesDeploy
 
     def deploy_succeeded?
       return false unless exists? && @latest_rs.present?
+      return false unless observed_generation == current_generation
 
       if required_rollout == 'full'
         @latest_rs.deploy_succeeded? &&
@@ -51,7 +52,8 @@ module KubernetesDeploy
     end
 
     def deploy_failed?
-      @latest_rs&.deploy_failed?
+      @latest_rs&.deploy_failed? &&
+      observed_generation == current_generation
     end
 
     def failure_message

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

@@ -8,9 +8,5 @@ module KubernetesDeploy
     def deploy_failed?
       false
     end
-
-    def deploy_method
-      :replace
-    end
   end
 end

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

@@ -24,10 +24,6 @@ module KubernetesDeploy
       false
     end
 
-    def deploy_method
-      :replace
-    end
-
     private
 
     def deployment_ready?

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

@@ -8,7 +8,7 @@ module KubernetesDeploy
     end
 
     def deploy_succeeded?
-      exists?
+      exists? && observed_generation == current_generation
     end
 
     def deploy_method

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

@@ -27,10 +27,6 @@ module KubernetesDeploy
       false
     end
 
-    def deploy_method
-      :replace
-    end
-
     private
 
     def deployment_ready?

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

@@ -26,12 +26,15 @@ module KubernetesDeploy
     end
 
     def deploy_succeeded?
+      observed_generation == current_generation &&
       desired_replicas == rollout_data["availableReplicas"].to_i &&
       desired_replicas == rollout_data["readyReplicas"].to_i
     end
 
     def deploy_failed?
-      pods.present? && pods.all?(&:deploy_failed?)
+      pods.present? &&
+      pods.all?(&:deploy_failed?) &&
+      observed_generation == current_generation
     end
 
     def desired_replicas

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

@@ -30,6 +30,7 @@ module KubernetesDeploy
         end
         true
       else
+        observed_generation == current_generation &&
         status_data['currentRevision'] == status_data['updateRevision'] &&
         desired_replicas == status_data['readyReplicas'].to_i &&
         desired_replicas == status_data['currentReplicas'].to_i
@@ -38,7 +39,8 @@ module KubernetesDeploy
 
     def deploy_failed?
       return false if update_strategy == ONDELETE
-      pods.present? && pods.any?(&:deploy_failed?)
+      pods.present? && pods.any?(&:deploy_failed?) &&
+      observed_generation == current_generation
     end
 
     private

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

@@ -8,9 +8,5 @@ module KubernetesDeploy
     def deploy_failed?
       false
     end
-
-    def deploy_method
-      :replace
-    end
   end
 end

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

@@ -8,9 +8,5 @@ module KubernetesDeploy
     def deploy_failed?
       false
     end
-
-    def deploy_method
-      :replace
-    end
   end
 end

data/lib/kubernetes-deploy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kubernetes-deploy
 version: !ruby/object:Gem::Version
-  version: 0.20.5
+  version: 0.20.6
 platform: ruby
 authors:
 - Katrina Verey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2018-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -57,16 +57,16 @@ dependencies:
   name: ejson
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement