Merge pull request kubernetes-sigs#6 from vivek-koppuru/fix-crs

Bug fix for clusterresourceset apply
ahreehong · Dec 8, 2022 · a0456bf · a0456bf
2 parents cd9a5cd + 4d2bfbb
commit a0456bf
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/exp/addons/internal/controllers/clusterresourceset_scope.go b/exp/addons/internal/controllers/clusterresourceset_scope.go
@@ -142,6 +142,8 @@ func (r *reconcileStrategyScope) apply(ctx context.Context, c client.Client, obj
 	}
 
 	patch := client.MergeFrom(currentObj.DeepCopy())
+	// metadata.ResourceVersion needs to be set to avoid webhook errors in applying
+	obj.SetResourceVersion(currentObj.GetResourceVersion())
 	if err = c.Patch(ctx, obj, patch); err != nil {
 		return errors.Wrapf(
 			err,