master: Makefile Automate operator-sdk install, preserve nullables.

[kaovilai]

Might fix make deploy-olm image override workarounds by forcing use of a GitHub release binary which hopefully uses tagged version of opm instead of latest by default.

[codecov-commenter]

Codecov Report

Base: 33.53% // Head: 33.53% // No change to project coverage 👍

Coverage data is based on head (82dc2f0) compared to base (0ce4b79).
Patch has no changes to coverable lines.

❗ Current head 82dc2f0 differs from pull request most recent head cf44973. Consider uploading reports for the commit cf44973 to get more accurate results

Additional details and impacted files

@@           Coverage Diff           @@
##           master     #846   +/-   ##
=======================================
  Coverage   33.53%   33.53%           
=======================================
  Files          17       17           
  Lines        3152     3152           
=======================================
  Hits         1057     1057           
  Misses       2003     2003           
  Partials       92       92           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

[kaovilai]

/retest

[kaovilai]

/retest

[openshift-ci]

@kaovilai: all tests passed!

Full PR test history. Your PR dashboard.

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/test-infra repository. I understand the commands that are listed here.

[sseago]

This fixes the make test crd formatting issue for me.

[kaovilai]

/cherry-pick oadp-1.1

[openshift-cherrypick-robot]

@kaovilai: #846 failed to apply on top of branch "oadp-1.1":

Applying: Makefile automate operator-sdk installation
Using index info to reconstruct a base tree...
M	Makefile
M	build/Dockerfile.bundle
M	bundle.Dockerfile
M	bundle/manifests/oadp-operator.clusterserviceversion.yaml
M	bundle/metadata/annotations.yaml
Falling back to patching base and 3-way merge...
Auto-merging bundle/metadata/annotations.yaml
CONFLICT (content): Merge conflict in bundle/metadata/annotations.yaml
Auto-merging bundle/manifests/oadp-operator.clusterserviceversion.yaml
Auto-merging bundle.Dockerfile
CONFLICT (content): Merge conflict in bundle.Dockerfile
Auto-merging build/Dockerfile.bundle
CONFLICT (content): Merge conflict in build/Dockerfile.bundle
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Makefile automate operator-sdk installation
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".

In response to this:

/cherry-pick oadp-1.1

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/test-infra repository.