krane 2.4.1 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93f7d9e842d616ea60e2c509f5e5a3fcb54d24375d426efd0345ba3a07dd2008
-  data.tar.gz: 24ccdd3165654319b55632a866f85839268644cb32ee719f55f03de6e5f63eb6
+  metadata.gz: 64b26c01ccbf33a59a0b18463afdcde52c7b223f120b804dd865e99a7fa1195c
+  data.tar.gz: bcd0a549f67c53e23f5c8ea556c8a97d847f30d9e54e088b0e26f0c9059c51d0
 SHA512:
-  metadata.gz: 1c90430d28fe8513dd86aef6d160e04257beb66f294b998d780c66b27d8bdb7e5320947b06894399c49bcb336795f72a338fb197f3be4626467bfb286bbde2f0
-  data.tar.gz: 98fc07319ed605978d558777cea947a187bf3857d229b95945096d446fdbacd2637102e34a9e03afb9f5472105ce39d5d396f9c1cf8bc6f4c0677f28e6b88e9b
+  metadata.gz: f617f7580dd5de9630ac439f2b0ded0aed198db11a2fbaa3a6ec72d4745c43001e9ffcea7570432ae13dab9224118f50da448958294317a5dd104597809e3dcf
+  data.tar.gz: 7a8807bdc559e2fe1b92734a347809f24cade1fac10bd00510b3667b3e9880bd7c37e75c1bf0dee44488a9972ad2f9c1b498a3e96107c143583fb018da2ed6f0

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 ## next
 
+## 2.4.4
+
+*Enhancements*
+
+- Improve DaemonSet rollout by ignoring `Evicted` Pods [#883](https://github.com/Shopify/krane/pull/883)
+
+## 2.4.3
+
+*Enhancements*
+
+- Improve DaemonSet rollout [#881](https://github.com/Shopify/krane/pull/881)
+
+## 2.4.2
+
+*Bug fixes*
+
+- Resolve errors for StatefulSet restart with `updateStrategy: OnDelete` [#876](https://github.com/Shopify/krane/pull/876)
+- Timeouts during the "predeploy priority resources" phase now raise `DeploymentTimeoutError` instead of `FatalDeploymentError` [#874](https://github.com/Shopify/krane/pull/874)
+
 ## 2.4.1
 
 *Enhancements*

data/lib/krane/kubernetes_resource/daemon_set.rb

@@ -9,7 +9,8 @@ module Krane
     def sync(cache)
       super
       @pods = exists? ? find_pods(cache) : []
-      @nodes = find_nodes(cache) if @nodes.blank?
+
+      @nodes = refresh_nodes(cache)
     end
 
     def status
@@ -58,7 +59,7 @@ module Krane
     def relevant_pods_ready?
       return true if rollout_data["desiredNumberScheduled"].to_i == rollout_data["numberReady"].to_i # all pods ready
       relevant_node_names = @nodes.map(&:name)
-      considered_pods = @pods.select { |p| relevant_node_names.include?(p.node_name) }
+      considered_pods = @pods.select { |p| relevant_node_names.include?(p.node_name) && !p.evicted? }
       @logger.debug("DaemonSet is reporting #{rollout_data['numberReady']} pods ready." \
         " Considered #{considered_pods.size} pods out of #{@pods.size} for #{@nodes.size} nodes.")
       considered_pods.present? &&
@@ -66,9 +67,24 @@ module Krane
         rollout_data["numberReady"].to_i >= considered_pods.length
     end
 
+    def refresh_nodes(cache)
+      new_nodes = find_nodes(cache)
+      return new_nodes if @nodes.blank?
+
+      # Remove non-existent nodes
+      @nodes.select do |node|
+        new_nodes.find { |n| n.name == node.name } != nil
+      end
+    end
+
     def find_nodes(cache)
       all_nodes = cache.get_all(Node.kind)
-      all_nodes.map { |node_data| Node.new(definition: node_data) }
+      all_nodes.each_with_object([]) do |node_data, relevant_nodes|
+        next if node_data.dig('spec', 'unschedulable').to_s.downcase == 'true'
+        cond = node_data.dig('status', 'conditions').find { |c| c['type'].downcase == 'ready' }
+        next if (!cond.nil? && cond['status'].downcase != 'true')
+        relevant_nodes << Node.new(definition: node_data)
+      end
     end
 
     def rollout_data

data/lib/krane/kubernetes_resource/pod.rb

@@ -105,6 +105,10 @@ module Krane
       @instance_data.dig('spec', 'nodeName')
     end
 
+    def evicted?
+      phase == "Failed" && reason == "Evicted"
+    end
+
     private
 
     def failed_schedule_reason

data/lib/krane/kubernetes_resource/stateful_set.rb

@@ -19,6 +19,9 @@ module Krane
     end
 
     def deploy_succeeded?
+      success = observed_generation == current_generation &&
+        desired_replicas == status_data['readyReplicas'].to_i &&
+        status_data['currentRevision'] == status_data['updateRevision']
       if update_strategy == ONDELETE
         # Gem cannot monitor update since it doesn't occur until delete
         unless @success_assumption_warning_shown
@@ -27,11 +30,10 @@ module Krane
                        "Consider switching to rollingUpdate.")
           @success_assumption_warning_shown = true
         end
+      else
+        success &= desired_replicas == status_data['currentReplicas'].to_i
       end
-      observed_generation == current_generation &&
-      status_data['currentRevision'] == status_data['updateRevision'] &&
-      desired_replicas == status_data['readyReplicas'].to_i &&
-      desired_replicas == status_data['currentReplicas'].to_i
+      success
     end
 
     def deploy_failed?

data/lib/krane/resource_deployer.rb

@@ -70,6 +70,7 @@ module Krane
             r.sync_debug_info(kubectl)
           end
           failed_resources.each { |r| logger.summary.add_paragraph(r.debug_message) }
+          raise DeploymentTimeoutError if failed_resources.all?(&:deploy_timed_out?)
           raise FatalDeploymentError, "Failed to deploy #{fail_count} priority #{'resource'.pluralize(fail_count)}"
         end
         logger.blank_line

data/lib/krane/restart_task.rb

@@ -213,7 +213,7 @@ module Krane
     def delete_statefulset_pods(record)
       pods = kubeclient.get_pods(namespace: record.metadata.namespace)
       pods.select! do |pod|
-        pod.metadata.ownerReferences.find { |ref| ref.uid == record.metadata.uid }
+        pod.metadata&.ownerReferences&.find { |ref| ref.uid == record.metadata.uid }
       end
       pods.each { |pod| kubeclient.delete_pod(pod.metadata.name, pod.metadata.namespace) }
     end

data/lib/krane/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Krane
-  VERSION = "2.4.1"
+  VERSION = "2.4.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: krane
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.4
 platform: ruby
 authors:
 - Katrina Verey
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport