Skip to content

Improve logs on Catalog discovery #1015

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
Feb 16, 2024
Merged

Improve logs on Catalog discovery #1015

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
5 changes: 4 additions & 1 deletion controllers/operator/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ func (s sortableCatalogSource) Less(i, j int) bool {
}
// Compare catalogsource priorities first, higher priority comes first
iPriority, jPriority := s[i].Priority, s[j].Priority
klog.V(2).Infof("iPriority: %v, jPriority: %v", iPriority, jPriority)
if iPriority != jPriority {
return iPriority > jPriority
}
Expand Down Expand Up @@ -179,8 +178,12 @@ func (m *ODLMOperator) GetCatalogSourceFromPackage(ctx context.Context, packageN
klog.Errorf("Not found PackageManifest %s in the namespace %s has channel %s", packageName, namespace, channel)
return "", "", nil
}
klog.V(2).Infof("Found %v CatalogSources for PackageManifest %s in the namespace %s has channel %s", len(catalogSourceCandidate), packageName, namespace, channel)
// Sort CatalogSources by priority
sort.Sort(sortableCatalogSource(catalogSourceCandidate))
for i, c := range catalogSourceCandidate {
klog.V(2).Infof("The %vth sorted CatalogSource is %s in namespace %s with priority: %v", i, c.Name, c.Namespace, c.Priority)
}
return catalogSourceCandidate[0].Name, catalogSourceCandidate[0].Namespace, nil
}
}
Expand Down