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

fix(packageserver): don't error out when listing #667

Merged
merged 1 commit into from
Jan 16, 2019
Merged

fix(packageserver): don't error out when listing #667

Show file tree
Hide file tree
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
10 changes: 5 additions & 5 deletions pkg/package-server/provider/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,13 +240,13 @@ func (p *RegistryProvider) List(namespace string) (*v1alpha1.PackageManifestList

pkgs := []v1alpha1.PackageManifest{}
for _, client := range p.clients {
if client.source.GetNamespace() == namespace || client.source.GetNamespace() == p.globalNamespace || namespace == "" {
if client.source.GetNamespace() == namespace || client.source.GetNamespace() == p.globalNamespace || namespace == metav1.NamespaceAll {
logger.Debugf("found CatalogSource %s", client.source.GetName())

stream, err := client.ListPackages(context.Background(), &api.ListPackageRequest{})
if err != nil {
logger.WithField("err", err.Error()).Warnf("error getting stream")
return nil, err
continue
}
for {
pkgName, err := stream.Recv()
Expand All @@ -256,17 +256,17 @@ func (p *RegistryProvider) List(namespace string) (*v1alpha1.PackageManifestList

if err != nil {
logger.WithField("err", err.Error()).Warnf("error getting data")
return nil, err
break
}
pkg, err := client.GetPackage(context.Background(), &api.GetPackageRequest{Name: pkgName.GetName()})
if err != nil {
logger.WithField("err", err.Error()).Warnf("error getting package")
return nil, err
break
}
newPkg, err := toPackageManifest(pkg, client)
if err != nil {
logger.WithField("err", err.Error()).Warnf("error converting to packagemanifest")
return nil, err
break
}

// Set request namespace to stop kube clients from complaining about global namespace mismatch.
Expand Down
Loading