Merge pull request #2936 from zendesk/grosser/force-update

do not do deletions when using RollingUpdate strategy on 1.9+
zendesk · Sep 14, 2018 · b4296fd · b4296fd
2 parents 582fa8e + ae7463c
commit b4296fd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/plugins/kubernetes/app/models/kubernetes/resource.rb b/plugins/kubernetes/app/models/kubernetes/resource.rb
@@ -374,7 +374,9 @@ def wait_for_termination_of_all_pods
 
     class StatefulSet < Base
       def patch_replace?
-        [nil, "OnDelete"].include?(@template.dig(:spec, :updateStrategy)) && running?
+        deprecated = @template.dig(:spec, :updateStrategy) # supporting pre 1.9 clusters
+        strategy = (deprecated.is_a?(String) ? deprecated : @template.dig(:spec, :updateStrategy, :type))
+        [nil, "OnDelete"].include?(strategy) && running?
       end
 
       # StatefulSet cannot be updated normally when OnDelete is used or kubernetes <1.7

diff --git a/plugins/kubernetes/test/models/kubernetes/resource_test.rb b/plugins/kubernetes/test/models/kubernetes/resource_test.rb
@@ -523,6 +523,15 @@ def deployment_stub(replica_count)
         end
       end
 
+      it "updates when running and using RollingUpdate" do
+        template[:spec][:updateStrategy] = {type: "RollingUpdate"}
+        assert_request(:get, url, to_return: {body: "{}"}) do
+          assert_request(:put, url, to_return: {body: "{}"}) do
+            resource.deploy
+          end
+        end
+      end
+
       it "patches and deletes pods when using OnDelete (default)" do
         set = {
           spec: {