Skip to content

Skip catalog discover when operator is not found in OperandRegistry #1050

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

Merged
ibm-ci-bot merged 1 commit into from
Jun 3, 2024
Merged

Skip catalog discover when operator is not found in OperandRegistry #1050

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Skip catalog discover when operator is not found in OperandRegistry 
Signed-off-by: Daniel Fan <[email protected]>
  • Loading branch information
@Daniel-Fan
Daniel-Fan committed Jun 3, 2024
commit 15011cc6709bad06f693175cfbdcb6d14534adb2
4 changes: 4 additions & 0 deletions controllers/operator/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,10 @@ func (m *ODLMOperator) GetOperatorNamespace(installMode, namespace string) strin
// GetOperandFromRegistry gets the Operand from the OperandRegistry
func (m *ODLMOperator) GetOperandFromRegistry(ctx context.Context, reg *apiv1alpha1.OperandRegistry, operandName string) (*apiv1alpha1.Operator, error) {
opt := reg.GetOperator(operandName)
if opt == nil {
return nil, nil
}

// Get excluded CatalogSource from annotation
// excluded-catalogsource: catalogsource1, catalogsource2
var excludedCatalogSources []string
Expand Down