Skip to content

Commit

Permalink
Strategic merge patch
Browse files Browse the repository at this point in the history
  • Loading branch information
skhalash committed Sep 26, 2024
1 parent 3d38875 commit c695873
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion internal/webhookcert/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func patchConversionWebhookConfig(ctx context.Context, c client.Client, conversi
return fmt.Errorf("failed to get logpipelines CRD: %w", err)
}

patch := client.MergeFrom(logPipelineCRD.DeepCopy())
patch := client.StrategicMergeFrom(logPipelineCRD.DeepCopy())

logPipelineCRD.Spec.Conversion = &conversion

Expand Down

0 comments on commit c695873

Please sign in to comment.