Skip to content

Commit 215e4f6

Browse files
Merge pull request #667 from njhale/fix-listing
fix(packageserver): don't error out when listing
2 parents f633e44 + dcda325 commit 215e4f6

File tree

2 files changed

+132
-8
lines changed

2 files changed

+132
-8
lines changed

pkg/package-server/provider/registry.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,13 +240,13 @@ func (p *RegistryProvider) List(namespace string) (*v1alpha1.PackageManifestList
240240

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

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

257257
if err != nil {
258258
logger.WithField("err", err.Error()).Warnf("error getting data")
259-
return nil, err
259+
break
260260
}
261261
pkg, err := client.GetPackage(context.Background(), &api.GetPackageRequest{Name: pkgName.GetName()})
262262
if err != nil {
263263
logger.WithField("err", err.Error()).Warnf("error getting package")
264-
return nil, err
264+
break
265265
}
266266
newPkg, err := toPackageManifest(pkg, client)
267267
if err != nil {
268268
logger.WithField("err", err.Error()).Warnf("error converting to packagemanifest")
269-
return nil, err
269+
break
270270
}
271271

272272
// Set request namespace to stop kube clients from complaining about global namespace mismatch.

0 commit comments

Comments
 (0)