jx gitops upgrade fails be cause of helm chart

I spent the day struggling with the use of jx gitops upgrade
After a lot of debugging and manual changes I reached the followng conclusion.
Kpt is not (yet) the best to merge changes from remote repo like jx-pipeline-catalog
It uses kustomize/kmr under the hood and tries to validate the yaml files inside charts/templates which are not valid yaml files (helm templates).
https://github.com/kptdev/kpt/issues/3351
We should either find a new approach or create a PR in KPT that adds a flag to git merge instead of yaml merge if the file can't be parsed. or just ignore the schema when parsing to skip common issues.