Do not generate related images direclty as it's done upstream

[FilipB]

We are using OSBS feature "Heuristic annotations" - https://osbs.readthedocs.io/en/latest/users.html?highlight=bundle#pullspec-locations

[FilipB]

/override ci/prow/lint

[openshift-ci]

@FilipB: Overrode contexts on behalf of FilipB: ci/prow/lint

In response to this:

/override ci/prow/lint

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[openshift-cherrypick-robot]

In response to a cherrypick label: #112 failed to apply on top of branch "release-3.0-tp1":

Applying: Do not generate related images direclty as it's done upstream We are using OSBS feture "Heuristic annotations" - https://osbs.readthedocs.io/en/latest/users.html?highlight=bundle#pullspec-locations
Using index info to reconstruct a base tree...
M	Makefile.vendor.mk
Falling back to patching base and 3-way merge...
Auto-merging Makefile.vendor.mk
CONFLICT (content): Merge conflict in Makefile.vendor.mk
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Do not generate related images direclty as it's done upstream We are using OSBS feture "Heuristic annotations" - https://osbs.readthedocs.io/en/latest/users.html?highlight=bundle#pullspec-locations
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".