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

generate csv: do not generate a package manifest for bundles #3014

Merged

Conversation

estroz
Copy link
Member

@estroz estroz commented May 12, 2020

Description of the change:

  • cmd/operator-sdk/generate: skip package manifest generation if --make-manifests=true (the default)

Motivation for the change: package manifests are not part of bundles

/kind bug

@openshift-ci-robot openshift-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label May 12, 2020
@estroz estroz merged commit c5445d7 into operator-framework:master May 12, 2020
@estroz estroz deleted the bugfix/no-package-manifests-bundle branch May 12, 2020 23:12
@estroz
Copy link
Member Author

estroz commented May 14, 2020

/cherry-pick v0.17.x

@openshift-cherrypick-robot

@estroz: #3014 failed to apply on top of branch "v0.17.x":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	cmd/operator-sdk/generate/csv.go
Falling back to patching base and 3-way merge...
Auto-merging cmd/operator-sdk/generate/csv.go
CONFLICT (content): Merge conflict in cmd/operator-sdk/generate/csv.go
Patch failed at 0001 generate csv: do not generate a package manifest when --make-manifests=true

In response to this:

/cherry-pick v0.17.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
kind/bug Categorizes issue or PR as related to a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants