Merge pull request kubernetes-sigs#2258 from k8s-infra-cherrypick-robot/cherry-pick-2257-to-release-0.14

🐛  ForceOwnership should work with subresources

Author: k8s-ci-robot

pkg/client/options.go

@@ -788,6 +788,11 @@ func (forceOwnership) ApplyToPatch(opts *PatchOptions) {
 	opts.Force = &definitelyTrue
 }
 
+func (forceOwnership) ApplyToSubResourcePatch(opts *SubResourcePatchOptions) {
+	definitelyTrue := true
+	opts.Force = &definitelyTrue
+}
+
 // }}}
 
 // {{{ DeleteAllOf Options

pkg/client/options_test.go

@@ -277,3 +277,18 @@ var _ = Describe("FieldOwner", func() {
 		Expect(o.FieldManager).To(Equal("foo"))
 	})
 })
+
+var _ = Describe("ForceOwnership", func() {
+	It("Should apply to PatchOptions", func() {
+		o := &client.PatchOptions{}
+		t := client.ForceOwnership
+		t.ApplyToPatch(o)
+		Expect(*o.Force).To(Equal(true))
+	})
+	It("Should apply to SubResourcePatchOptions", func() {
+		o := &client.SubResourcePatchOptions{PatchOptions: client.PatchOptions{}}
+		t := client.ForceOwnership
+		t.ApplyToSubResourcePatch(o)
+		Expect(*o.Force).To(Equal(true))
+	})
+})