Adjust logic for OnDelete STS Readiness

Shopify · Mar 8, 2022 · 6e8bf2b · 6e8bf2b
1 parent c8dc4cc
commit 6e8bf2b
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/krane/kubernetes_resource/stateful_set.rb b/lib/krane/kubernetes_resource/stateful_set.rb
@@ -19,6 +19,9 @@ def status
     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 @@ def deploy_succeeded?
                        "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?