Fix `PatchesStrategicMerge` deprecation warning#136

Merged

openshift-merge-bot[bot] merged 2 commits intoopen-cluster-management-io:mainfrom dhaiducek:deprecated-patchesstrategicmerge

Dec 11, 2023

+40-14

Commits on Dec 8, 2023