Skip to content

generate: respect project version when getting package name #4431

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.

Sign up for GitHub

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

Jump to bottom
Merged
estroz merged 2 commits into from
Jan 27, 2021
Merged

generate: respect project version when getting package name #4431

estroz merged 2 commits into from
Jan 27, 2021

Conversation

@estroz
Copy link
Member

@estroz estroz commented Jan 25, 2021

Description of the change:

  • internal/cmd/operator-sdk/generate: respect project version when getting package name

Motivation for the change: project version determines how package name is retrieved for a project (dir name vs. config's projectName field).

/kind bug

Signed-off-by: Eric Stroczynski [email protected]

Checklist

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

@openshift-ci-robot openshift-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Jan 25, 2021
estroz added 2 commits January 25, 2021 13:06
@estroz
internal/cmd/operator-sdk/generate: respect project version when gett…
816d3e7 
…ing package name

Signed-off-by: Eric Stroczynski <[email protected]>
@estroz
add changelog fragment
fe0a598 
Signed-off-by: Eric Stroczynski <[email protected]>
@estroz estroz force-pushed the bugfix/generate-no-project-file branch from d94456a to fe0a598 Compare January 25, 2021 21:06
@estroz
Copy link
Member Author

estroz commented Jan 26, 2021

/assign @rashmigottipati

rashmigottipati
rashmigottipati approved these changes Jan 27, 2021
View reviewed changes
Copy link
Member

@rashmigottipati rashmigottipati 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-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 27, 2021
@estroz estroz merged commit d7123b9 into operator-framework:master Jan 27, 2021
@estroz estroz deleted the bugfix/generate-no-project-file branch January 27, 2021 16:31
@estroz
Copy link
Member Author

estroz commented Jan 27, 2021

/cherry-pick v1.3.x

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Jan 27, 2021

@estroz: #4431 failed to apply on top of branch "v1.3.x":

Applying: internal/cmd/operator-sdk/generate: respect project version when getting package name
Using index info to reconstruct a base tree...
M	internal/cmd/operator-sdk/generate/bundle/bundle.go
M	internal/cmd/operator-sdk/generate/internal/genutil.go
Falling back to patching base and 3-way merge...
Auto-merging internal/cmd/operator-sdk/generate/internal/genutil.go
CONFLICT (content): Merge conflict in internal/cmd/operator-sdk/generate/internal/genutil.go
Auto-merging internal/cmd/operator-sdk/generate/bundle/bundle.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 internal/cmd/operator-sdk/generate: respect project version when getting package name
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".
Details

In response to this:

/cherry-pick v1.3.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.

estroz pushed a commit to estroz/operator-sdk that referenced this pull request Jan 27, 2021
@estroz
generate: respect project version when getting package name (operator…
ae3e82c 
…-framework#4431)
@estroz estroz mentioned this pull request Jan 27, 2021
Merged
estroz pushed a commit that referenced this pull request Jan 27, 2021
generate: respect project version when getting package name (#4431) (#…
4bee54f 
…4443)
reinvantveer pushed a commit to reinvantveer/operator-sdk that referenced this pull request Feb 4, 2021
@reinvantveer
generate: respect project version when getting package name (operator…
f39824a 
…-framework#4431)

Signed-off-by: Rein van 't Veer <[email protected]>
reinvantveer pushed a commit to reinvantveer/operator-sdk that referenced this pull request Feb 4, 2021
@reinvantveer
generate: respect project version when getting package name (operator…
c7dc75f 
…-framework#4431)

Signed-off-by: Rein van 't Veer <[email protected]>
reinvantveer pushed a commit to reinvantveer/operator-sdk that referenced this pull request Feb 5, 2021
generate: respect project version when getting package name (operator…
856aa15 
…-framework#4431)

Signed-off-by: Rein van 't Veer <[email protected]>
reinvantveer pushed a commit to reinvantveer/operator-sdk that referenced this pull request Feb 5, 2021
generate: respect project version when getting package name (operator…
5468ede 
…-framework#4431)

Signed-off-by: reinvantveer <[email protected]>
reinvantveer pushed a commit to reinvantveer/operator-sdk that referenced this pull request Feb 5, 2021
generate: respect project version when getting package name (operator…
a818447 
…-framework#4431)

Signed-off-by: Rein van 't Veer <[email protected]>
Signed-off-by: reinvantveer <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rashmigottipati rashmigottipati rashmigottipati approved these changes

@jmrodri jmrodri Awaiting requested review from jmrodri

@marc-obrien marc-obrien Awaiting requested review from marc-obrien

Assignees

@rashmigottipati rashmigottipati

Labels

kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@estroz @openshift-cherrypick-robot @rashmigottipati @openshift-ci-robot