Skip to content

Commit

Permalink
fix(operator): merge with overwrite resource reference (#1437)
Browse files Browse the repository at this point in the history
  • Loading branch information
paul-nicolas committed Apr 22, 2024
1 parent ed4821d commit 2d0c8e6
Showing 1 changed file with 1 addition and 1 deletion.
Expand Up @@ -152,7 +152,7 @@ func Reconcile(ctx Context, stack *v1beta1.Stack, req *v1beta1.ResourceReference

_, err = controllerutil.CreateOrUpdate(ctx, ctx.GetClient(), newResource, func() error {
content := newResource.UnstructuredContent()
if err := mergo.Merge(&content, resource.UnstructuredContent()); err != nil {
if err := mergo.MergeWithOverwrite(&content, resource.UnstructuredContent()); err != nil {
return err
}

Expand Down

0 comments on commit 2d0c8e6

Please sign in to comment.