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

abhay-krishna · web-flow · commit 852c63e35fff · 2022-12-07T17:11:59.000-08:00
Bug fix for clusterresourceset apply
diff --git a/exp/addons/internal/controllers/clusterresourceset_scope.go b/exp/addons/internal/controllers/clusterresourceset_scope.go
@@ -141,7 +141,7 @@ func (r *reconcileStrategyScope) apply(ctx context.Context, c client.Client, obj
 		)
 	}
 
-	patch := client.MergeFrom(currentObj.DeepCopy())
+	patch := client.MergeFrom(obj.DeepCopy())
 	if err = c.Patch(ctx, obj, patch); err != nil {
 		return errors.Wrapf(
 			err,

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ func (r *reconcileStrategyScope) apply(ctx context.Context, c client.Client, obj`
`141`	`141`	`)`
`142`	`142`	`}`
`143`	`143`
`144`		`- patch := client.MergeFrom(currentObj.DeepCopy())`
	`144`	`+ patch := client.MergeFrom(obj.DeepCopy())`
`145`	`145`	`if err = c.Patch(ctx, obj, patch); err != nil {`
`146`	`146`	`return errors.Wrapf(`
`147`	`147`	`err,`