From 2dd04ac8ec598844f911cee20ee27ca74a598dc1 Mon Sep 17 00:00:00 2001 From: souravbiswassanto Date: Tue, 27 Feb 2024 17:40:07 +0600 Subject: [PATCH] Removed strategic merge patch Signed-off-by: souravbiswassanto --- client/clientset/versioned/typed/apps/v1/util.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/clientset/versioned/typed/apps/v1/util.go b/client/clientset/versioned/typed/apps/v1/util.go index 5ce568ce..1eb95d29 100644 --- a/client/clientset/versioned/typed/apps/v1/util.go +++ b/client/clientset/versioned/typed/apps/v1/util.go @@ -81,7 +81,7 @@ func PatchPetSetObject(ctx context.Context, psc AppsV1Interface, cur, mod *v1.Pe return cur, kutil.VerbUnchanged, nil } klog.V(3).Infof("Patching PetSet %s/%s with %s.", cur.Namespace, cur.Name, string(patch)) - out, err := psc.PetSets(cur.Namespace).Patch(ctx, cur.Name, types.StrategicMergePatchType, patch, opts) + out, err := psc.PetSets(cur.Namespace).Patch(ctx, cur.Name, types.MergePatchType, patch, opts) return out, kutil.VerbPatched, err }