Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: specify the right path of metadata in bundle.Dockerfile #5030

Merged

Conversation

varshaprasad96
Copy link
Member

@varshaprasad96 varshaprasad96 commented Jun 30, 2021

Description of the change:
Specify the right path of metadata in bundle.Dockerfile when output-dir is specified.

Motivation for the change:
closes #5021

Checklist

If the pull request includes user-facing changes, extra documentation is required:

@openshift-ci openshift-ci bot requested review from fabianvf and theishshah June 30, 2021 17:40
Signed-off-by: varshaprasad96 <varshaprasad96@gmail.com>
Copy link
Member

@estroz estroz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 30, 2021
@varshaprasad96 varshaprasad96 merged commit 7356782 into operator-framework:master Jun 30, 2021
@varshaprasad96
Copy link
Member Author

/cherry-pick v1.9.x

@openshift-cherrypick-robot

@varshaprasad96: new pull request created: #5035

In response to this:

/cherry-pick v1.9.x

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.

@varshaprasad96
Copy link
Member Author

/cherry-pick v1.8.x

@openshift-cherrypick-robot

@varshaprasad96: #5030 failed to apply on top of branch "v1.8.x":

Applying: fix: specify the right path of metadata in bundle.Dockerfile
Using index info to reconstruct a base tree...
M	internal/util/bundleutil/bundleutil.go
Falling back to patching base and 3-way merge...
Auto-merging internal/util/bundleutil/bundleutil.go
CONFLICT (content): Merge conflict in internal/util/bundleutil/bundleutil.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: specify the right path of metadata in bundle.Dockerfile
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 v1.8.x

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.

@varshaprasad96
Copy link
Member Author

/cherry-pick v1.8.x

@openshift-cherrypick-robot

@varshaprasad96: new pull request created: #5037

In response to this:

/cherry-pick v1.8.x

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Operator SDK v1.9.0 seems to ignore --output-dir when generating bundle.Dockerfile
3 participants