CR's no longer need to use replace

lib/kubernetes-deploy/kubernetes_resource/bucket.rb

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

lib/kubernetes-deploy/kubernetes_resource/cloudsql.rb

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

lib/kubernetes-deploy/kubernetes_resource/elasticsearch.rb

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

lib/kubernetes-deploy/kubernetes_resource/memcached.rb

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

lib/kubernetes-deploy/kubernetes_resource/redis.rb

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

lib/kubernetes-deploy/kubernetes_resource/topic.rb

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

test/fixtures/crd/mail_cr.yml

@@ -2,3 +2,5 @@ apiVersion: "stable.example.io/v1"
 kind: Mail
 metadata:
   name: my-first-mail
+spec:
+  something: 7

test/integration-serial/run_serial_test.rb

@@ -119,6 +119,18 @@ def test_multiple_configuration_files
     ENV['KUBECONFIG'] = old_config
   end
 
+  def test_cr_merging
+    assert_deploy_success(deploy_fixtures("crd", subset: %w(mail.yml)))
+    assert_deploy_success(deploy_fixtures("crd", subset: %w(mail_cr.yml)))
+    result = deploy_fixtures("crd", subset: %w(mail_cr.yml)) do |f|
+      mail = f.dig("mail_cr.yml", "Mail").first
+      mail["spec"]["something"] = 5
+    end
+    assert_deploy_success(result)
+  ensure
+    apiextensions_v1beta1_kubeclient.delete_custom_resource_definition("mail.stable.example.io")
+  end
+
   def test_crd_can_fail
     result = deploy_fixtures("crd", subset: %w(mail.yml)) do |f|
       crd = f.dig("mail.yml", "CustomResourceDefinition").first
@@ -172,6 +184,12 @@ def deploy_method
       /The following resources were pruned: widget(.stable.example.io)? "my-first-widget"/,
       "Pruned 1 resource and successfully deployed 2 resource"
     ])
+
+    result = deploy_fixtures("crd", subset: %w(mail_cr.yml)) do |f|
+      mail = f.dig("mail_cr.yml", "Mail").first
+      mail["spec"]["something"] = 5
+    end
+    assert_deploy_success(result)
   ensure
     apiextensions_v1beta1_kubeclient.delete_custom_resource_definition("mail.stable.example.io")
     apiextensions_v1beta1_kubeclient.delete_custom_resource_definition("widgets.stable.example.io")