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

Bug 1831818: Remove Obsolete default OperatorSource #308

Merged
merged 1 commit into from May 8, 2020
Merged

Bug 1831818: Remove Obsolete default OperatorSource #308

merged 1 commit into from May 8, 2020

Conversation

anik120
Copy link
Contributor

@anik120 anik120 commented May 6, 2020

In #300, the OperatorHub API was enhanced to accept both OperatorSource
and CatalogSource as defaults. However, when an existing OperatorSource
in a cluster was switched to a CatalogSource, the old OperatorSource
persisted. This PR fixes the issue, and removes the obsolete OperatorSource,
so that there's only one source for a catalog of operators.

Description of the change:

Motivation for the change:

Reviewer Checklist

  • Implementation matches the proposed design, or proposal is updated to match implementation
  • Sufficient unit test coverage
  • Sufficient end-to-end test coverage
  • Docs updated or added to /docs
  • Commit messages sensible and descriptive

@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label May 6, 2020
@openshift-ci-robot
Copy link
Contributor

@anik120: This pull request references Bugzilla bug 1831818, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1831818: Remove Obsolete default OperatorSource

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.

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label May 6, 2020
@anik120
Copy link
Contributor Author

anik120 commented May 6, 2020

/test e2e-aws-operator

@ecordell
Copy link
Member

ecordell commented May 7, 2020

/retest

@ecordell
Copy link
Member

ecordell commented May 7, 2020

/approve

This looks good, I will leave it to @kevinrizza to lgtm since you had a comment

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: anik120, ecordell

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 7, 2020
@kevinrizza
Copy link
Member

Misunderstood the way this api worked. On further investigation, this seems reasonable.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 7, 2020
@ecordell
Copy link
Member

ecordell commented May 7, 2020

/cherry-pick release-4.4

@openshift-cherrypick-robot
Copy link

@ecordell: once the present PR merges, I will cherry-pick it on top of release-4.4 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.4

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.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@anik120
Copy link
Contributor Author

anik120 commented May 7, 2020

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@anik120 anik120 force-pushed the fix-operatorhub-clean-obsolete-resources branch from b076037 to 4401474 Compare May 8, 2020 00:18
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label May 8, 2020
@anik120
Copy link
Contributor Author

anik120 commented May 8, 2020

/retest

@anik120 anik120 force-pushed the fix-operatorhub-clean-obsolete-resources branch 3 times, most recently from 6d66dc3 to 1b8bd1d Compare May 8, 2020 14:57
@anik120
Bug 1831818: Remove Obsolete default OperatorSource
c6457f8 
In operator-framework#300, the OperatorHub API was enhanced to accept both OperatorSource
and CatalogSource as defaults. However, when an existing OperatorSource
in a cluster was switched to a CatalogSource, the old OperatorSource
persisted. This PR fixes the issue, and removes the obsolete OperatorSource,
so that there's only one source for a catalog of operators.
@anik120 anik120 force-pushed the fix-operatorhub-clean-obsolete-resources branch from 1b8bd1d to c6457f8 Compare May 8, 2020 14:59
@anik120
Copy link
Contributor Author

anik120 commented May 8, 2020

/test e2e-aws-operator

1 similar comment
@anik120
Copy link
Contributor Author

anik120 commented May 8, 2020

/test e2e-aws-operator

@dinhxuanvu
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 8, 2020
@ecordell
Copy link
Member

ecordell commented May 8, 2020

/lgtm

@openshift-merge-robot openshift-merge-robot merged commit b1ba97f into operator-framework:master May 8, 2020
@openshift-ci-robot
Copy link
Contributor

@anik120: All pull requests linked via external trackers have merged: operator-framework/operator-marketplace#308. Bugzilla bug 1831818 has been moved to the MODIFIED state.

In response to this:

Bug 1831818: Remove Obsolete default OperatorSource

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.

@openshift-cherrypick-robot
Copy link

@ecordell: #308 failed to apply on top of branch "release-4.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	cmd/manager/main.go
M	pkg/defaults/defaults.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/defaults/defaults.go
CONFLICT (content): Merge conflict in pkg/defaults/defaults.go
Auto-merging cmd/manager/main.go
Patch failed at 0001 Bug 1831818: Remove Obsolete default OperatorSource

In response to this:

/cherry-pick release-4.4

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.

@ecordell
Copy link
Member

ecordell commented May 8, 2020

Note - this doesn't need to be cherry-picked

@anik120 anik120 mentioned this pull request Nov 3, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ecordell ecordell ecordell left review comments

@kevinrizza kevinrizza kevinrizza left review comments

@tkashem tkashem Awaiting requested review from tkashem

Assignees

@ecordell ecordell

@kevinrizza kevinrizza

@dinhxuanvu dinhxuanvu

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. 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.

None yet
8 participants
@anik120 @openshift-ci-robot @ecordell @kevinrizza @openshift-cherrypick-robot @openshift-bot @dinhxuanvu @openshift-merge-robot