krane 2.4.2 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 422192af588ad4f4eb53c73fbf56ee6b8fc7dad69c5cec7dfe5a4f7b7f702b98
-  data.tar.gz: 413719980210e537b8c4d1958d7867224cb5743905f489680caac3261a4b60c7
+  metadata.gz: 0231d6f4ef50874282ebc4456e5a13ba48408ec22a2b9caef05229323561c2f3
+  data.tar.gz: b3007f0d090526b1552638e63aa3a350e6cc8182aab6abc536f1eafe0acb02fb
 SHA512:
-  metadata.gz: a2ade15d59fe5fae20839c5aaa7002b3fbfc0e39373afbc7f66ddcde77f51f98451b2e5ac250147dd6cb4e0cc0cf23b234e764415a75764f53422f14f579ee74
-  data.tar.gz: addcd5f11bdb4a6fe4b0eaf82056fbd7aff79831a6813888e01192fe7edd094b05f83399af4c0b34370076153f7bb469bee8ca4f2c4761fd3e8ae4f022dff56f
+  metadata.gz: 21b40ac3a9ad836e29f293a1ddd293991ab8c784c54869d705496a101500d22893f3033d28632f8175f49b23397fa74f8cd3b98f18bf614447c30568f13f7bfa
+  data.tar.gz: 89d62f90ddccbfcea97abd44dc304f846f639d6a94781efef2f99b361bdd2e604233e6a968a1f8b583ea213b9d6052f6c52ca9fa6526312bb52cc14ba2172e70

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 ## next
 
+## 2.4.5
+
+*Bug fixes*
+
+- Revert PR that tried to fail fast when there are container initialization issues to give pods time to be recreated and possible succeed [#885](https://github.com/Shopify/krane/pull/885)
+
+## 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*

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
@@ -225,7 +229,9 @@ module Krane
         elsif limbo_reason == "ErrImagePull" && limbo_message.match(/not found/i)
           "Failed to pull image #{@image}. "\
           "Did you wait for it to be built and pushed to the registry before deploying?"
-        elsif limbo_reason == "CreateContainerConfigError"
+        # Only fail fast when message doesn't include `failed to sync secret cache`.
+        # It's possible that a secret is being created and the pod could get recreated and succeed
+        elsif limbo_reason == "CreateContainerConfigError" && !limbo_message.include?("failed to sync secret cache")
           "Failed to generate container configuration: #{limbo_message}"
         elsif @status.dig("lastState", "terminated", "reason") == "ContainerCannotRun"
           # ref: https://github.com/kubernetes/kubernetes/blob/562e721ece8a16e05c7e7d6bdd6334c910733ab2/pkg/kubelet/dockershim/docker_container.go#L353

data/lib/krane/version.rb

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

metadata

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