github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-07-21 18:32:50 +00:00
Code Issues Projects Releases Wiki Activity

SSA to add pod failure conditions - ready for review

Browse Source 
Kubernetes-commit: fea883687feafc597591e15773f8c6f491b35d08
This commit is contained in:
Michal Wozniak 2022-10-24 14:55:16 +02:00 committed by Kubernetes Publisher
parent a232cf00b9
commit a191e58772
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/fixture.go
View File

@ -181,7 +181,7 @@ func ObjectReaction(tracker ObjectTracker) ReactionFunc {
if err := json.Unmarshal(modified, obj); err != nil { if err := json.Unmarshal(modified, obj); err != nil {
return true, nil, err return true, nil, err
} }
case types.StrategicMergePatchType: case types.StrategicMergePatchType, types.ApplyPatchType:
mergedByte, err := strategicpatch.StrategicMergePatch(old, action.GetPatch(), obj) mergedByte, err := strategicpatch.StrategicMergePatch(old, action.GetPatch(), obj)
if err != nil { if err != nil {
return true, nil, err return true, nil, err