From a191e587727257f5b9d87a6e22fff810b83a2352 Mon Sep 17 00:00:00 2001 From: Michal Wozniak Date: Mon, 24 Oct 2022 14:55:16 +0200 Subject: [PATCH] SSA to add pod failure conditions - ready for review Kubernetes-commit: fea883687feafc597591e15773f8c6f491b35d08 --- testing/fixture.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/fixture.go b/testing/fixture.go index 85444f9d05..396840670f 100644 --- 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