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.

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

generate csv: de-deprecate package manifests format #2944

Merged
merged 2 commits into from Apr 29, 2020
Merged

generate csv: de-deprecate package manifests format #2944

merged 2 commits into from Apr 29, 2020

Conversation

estroz
Copy link
Member

@estroz estroz commented Apr 29, 2020

Description of the change: remove deprecation notices and comments for package manifests format generation

Motivation for the change: operator authors should be able to manage the operator-registry manifests format using the SDK, since it is still supported by operator-registry servers.

@estroz estroz added the olm-integration Issue relates to the OLM integration label Apr 29, 2020
@estroz estroz force-pushed the chore/revert-package-manifest-deprecation branch 4 times, most recently from 3384e7a to ddbedc2 Compare April 29, 2020 21:40
joelanford
joelanford approved these changes Apr 29, 2020
View reviewed changes
Copy link
Member

@joelanford joelanford left a comment

Choose a reason for hiding this comment

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

A couple of nits.

LGTM otherwise and on passing CI.

changelog/fragments/2944-change.yaml Outdated Show resolved Hide resolved
cmd/operator-sdk/bundle/cmd.go Outdated Show resolved Hide resolved
@estroz estroz force-pushed the chore/revert-package-manifest-deprecation branch from ddbedc2 to 39c8e72 Compare April 29, 2020 21:46
@estroz estroz mentioned this pull request Apr 29, 2020
Closed
@estroz
*: de-deprecate package manifests format. operator authors should
3a72c50 
be able to manage this operator-registry manifests format using
the SDK
@estroz estroz force-pushed the chore/revert-package-manifest-deprecation branch from 39c8e72 to 3a72c50 Compare April 29, 2020 22:04
@estroz
Copy link
Member Author

estroz commented Apr 29, 2020

Closes #2879

@estroz estroz merged commit 1475e02 into operator-framework:master Apr 29, 2020
@estroz estroz deleted the chore/revert-package-manifest-deprecation branch April 29, 2020 22:49
@estroz estroz mentioned this pull request Apr 29, 2020
Closed
@camilamacedo86 camilamacedo86 mentioned this pull request May 5, 2020
Closed
@estroz estroz mentioned this pull request May 13, 2020
Merged
@estroz
Copy link
Member Author

estroz commented May 13, 2020

/cherry-pick v0.17.x

@openshift-cherrypick-robot
Copy link

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

Using index info to reconstruct a base tree...
M	cmd/operator-sdk/generate/csv.go
M	internal/generate/olm-catalog/package_manifest.go
M	internal/generate/olm-catalog/package_manifest_test.go
A	website/content/en/docs/olm-integration/generating-a-csv.md
A	website/content/en/docs/olm-integration/user-guide.md
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): website/content/en/docs/olm-integration/user-guide.md deleted in HEAD and modified in *: de-deprecate package manifests format. operator authors should be able to manage this operator-registry manifests format using the SDK. Version *: de-deprecate package manifests format. operator authors should be able to manage this operator-registry manifests format using the SDK of website/content/en/docs/olm-integration/user-guide.md left in tree.
Auto-merging website/content/en/docs/golang/olm-integration/generating-a-csv.md
Auto-merging internal/generate/olm-catalog/package_manifest_test.go
CONFLICT (content): Merge conflict in internal/generate/olm-catalog/package_manifest_test.go
Auto-merging internal/generate/olm-catalog/package_manifest.go
CONFLICT (content): Merge conflict in internal/generate/olm-catalog/package_manifest.go
Auto-merging cmd/operator-sdk/generate/csv.go
error: Failed to merge in the changes.
Patch failed at 0001 *: de-deprecate package manifests format. operator authors should be able to manage this operator-registry manifests format using the SDK

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.

estroz added a commit to estroz/operator-sdk that referenced this pull request May 13, 2020
@estroz
generate csv: de-deprecate package manifests format (operator-framewo…
cd40466 
…rk#2944)
@estroz estroz mentioned this pull request May 13, 2020
Merged
estroz added a commit to estroz/operator-sdk that referenced this pull request May 13, 2020
@estroz
generate csv: de-deprecate package manifests format (operator-framewo…
d7665b2 
…rk#2944)
estroz added a commit to estroz/operator-sdk that referenced this pull request May 14, 2020
@estroz
generate csv: de-deprecate package manifests format (operator-framewo…
c0584e9 
…rk#2944)
estroz added a commit that referenced this pull request May 14, 2020
@estroz
[v0.17.x] generate csv: de-deprecate package manifests format (#2944) (…
7628ddb 
…#3030)
@estroz estroz mentioned this pull request May 27, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joelanford joelanford joelanford approved these changes

@camilamacedo86 camilamacedo86 Awaiting requested review from camilamacedo86

@hasbro17 hasbro17 Awaiting requested review from hasbro17

Assignees
No one assigned
Labels
olm-integration Issue relates to the OLM integration
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@estroz @openshift-cherrypick-robot @joelanford