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
[release-4.6] Bug 1895952: Allow catsrc with default catsrc name in disconnected env #362
Conversation
With the introduction of operator-framework#336, when a CatalogSource with the same name as that of a default CatalogSource name was being created, the new CatalogSource was either being restored to the default Spec, or being removed if the CatalogSource was disabled via OperatorHub. This made is impossible to create a CatalogSource with the same name as that of the default CatalogSource in a disconnected cluster enviroment. This PR fixes the issue by allowing for creation/update/deleteion of a CatalogSource with the same name as that of a default CatalogSource, if it has been disabled via OperatorHub first. When the default CatalogSource is renabled via OperatorHub, the default CatalogSource Spec is restored by overriding the custom created CatalogSource.
@openshift-cherrypick-robot: Bugzilla bug 1868770 has been cloned as Bugzilla bug 1895952. Retitling PR to link against new bug. In response to this:
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: This pull request references Bugzilla bug 1895952, 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. 6 validation(s) were run on this bug
In response to this:
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. |
/approve |
/retest Please review the full test history for this PR and help us cut down flakes. |
4 similar comments
/retest Please review the full test history for this PR and help us cut down flakes. |
/retest Please review the full test history for this PR and help us cut down flakes. |
/retest Please review the full test history for this PR and help us cut down flakes. |
/retest Please review the full test history for this PR and help us cut down flakes. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dinhxuanvu, kevinrizza, openshift-cherrypick-robot 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 |
/retest Please review the full test history for this PR and help us cut down flakes. |
6 similar comments
/retest Please review the full test history for this PR and help us cut down flakes. |
/retest Please review the full test history for this PR and help us cut down flakes. |
/retest Please review the full test history for this PR and help us cut down flakes. |
/retest Please review the full test history for this PR and help us cut down flakes. |
/retest Please review the full test history for this PR and help us cut down flakes. |
/retest Please review the full test history for this PR and help us cut down flakes. |
/retest Please review the full test history for this PR and help us cut down flakes. |
1 similar comment
/retest Please review the full test history for this PR and help us cut down flakes. |
@openshift-cherrypick-robot: All pull requests linked via external trackers have merged: Bugzilla bug 1895952 has been moved to the MODIFIED state. In response to this:
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. |
In operator-framework#362, marketplace's catalogsource reconciler was updated to allow custom Catalogsources with the same name as one of the default Catalogsources, when the default Catalogsource was disabled first with the operatorhub api. However, when marketplace was restarted, the custom catalogsource was being force deleted by marketplace's operatorhub controller. This PR adds a special annotation to the default CatalogSources, and updates the operator to delete any catalogsource with the same name as one of the default only if the CatalogSource has that special annotation.
In operator-framework#362, marketplace's catalogsource reconciler was updated to allow custom Catalogsources with the same name as one of the default Catalogsources, when the default Catalogsource was disabled first with the operatorhub api. However, when marketplace was restarted, the custom catalogsource was being force deleted by marketplace's operatorhub controller. This PR adds a special annotation to the default CatalogSources, and updates the operator to delete any catalogsource with the same name as one of the default only if the CatalogSource has that special annotation.
In operator-framework#362, marketplace's catalogsource reconciler was updated to allow custom Catalogsources with the same name as one of the default Catalogsources, when the default Catalogsource was disabled first with the operatorhub api. However, when marketplace was restarted, the custom catalogsource was being force deleted by marketplace's operatorhub controller. This PR adds a special annotation to the default CatalogSources, and updates the operator to delete any catalogsource with the same name as one of the default only if the CatalogSource has that special annotation.
In operator-framework#362, marketplace's catalogsource reconciler was updated to allow custom Catalogsources with the same name as one of the default Catalogsources, when the default Catalogsource was disabled first with the operatorhub api. However, when marketplace was restarted, the custom catalogsource was being force deleted by marketplace's operatorhub controller. This PR adds a special annotation to the default CatalogSources, and updates the operator to delete any catalogsource with the same name as one of the default only if the CatalogSource has that special annotation.
In operator-framework#362, marketplace's catalogsource reconciler was updated to allow custom Catalogsources with the same name as one of the default Catalogsources, when the default Catalogsource was disabled first with the operatorhub api. However, when marketplace was restarted, the custom catalogsource was being force deleted by marketplace's operatorhub controller. This PR adds a special annotation to the default CatalogSources, and updates the operator to delete any catalogsource with the same name as one of the default only if the CatalogSource has that special annotation. In addition, the behavior of the marketplace operator as it relates to reconciling the default CatalogSources should no longer be tied to its process lifecycle.
In operator-framework#362, marketplace's catalogsource reconciler was updated to allow custom Catalogsources with the same name as one of the default Catalogsources, when the default Catalogsource was disabled first with the operatorhub api. However, when marketplace was restarted, the custom catalogsource was being force deleted by marketplace's operatorhub controller. This PR adds a special annotation to the default CatalogSources, and updates the operator to delete any catalogsource with the same name as one of the default only if the CatalogSource has that special annotation. In addition, the behavior of the marketplace operator as it relates to reconciling the default CatalogSources should no longer be tied to its process lifecycle.
This is an automated cherry-pick of #359
/assign anik120