Skip to content

Commit

Permalink
SSA to add pod failure conditions - ready for review
Browse files Browse the repository at this point in the history
Kubernetes-commit: fea883687feafc597591e15773f8c6f491b35d08
  • Loading branch information
mimowo authored and k8s-publishing-bot committed Oct 24, 2022
1 parent a232cf0 commit a191e58
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion testing/fixture.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a191e58

Please sign in to comment.