Merge pull request #113304 from mimowo/handling-pod-failures-beta-ssa

Use SSA to add pod failure conditions Kubernetes-commit: 3c9928e4f87c1d023e595292e6139cbd8dfedd5c
marcobebway · Oct 28, 2022 · 0d57396 · 0d57396
2 parents a232cf0 + a191e58
commit 0d57396
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/testing/fixture.go b/testing/fixture.go
@@ -181,7 +181,7 @@ func ObjectReaction(tracker ObjectTracker) ReactionFunc {
 				if err := json.Unmarshal(modified, obj); err != nil {
 					return true, nil, err
 				}
-			case types.StrategicMergePatchType:
+			case types.StrategicMergePatchType, types.ApplyPatchType:
 				mergedByte, err := strategicpatch.StrategicMergePatch(old, action.GetPatch(), obj)
 				if err != nil {
 					return true, nil, err