Skip to content

Commit 4cf579f

Browse files
authored
operator describe: don't panic when specified package name is not found (#79)
Signed-off-by: Joe Lanford <[email protected]> Signed-off-by: Joe Lanford <[email protected]>
1 parent f33fd9a commit 4cf579f

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

internal/pkg/action/operator_list_available.go

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,21 @@ func (l *OperatorListAvailable) Run(ctx context.Context) ([]operator.PackageMani
3535
labelSelector["catalog-namespace"] = l.Catalog.Namespace
3636
}
3737

38+
if l.Package != "" {
39+
pm := v1.PackageManifest{}
40+
if err := l.config.Client.Get(ctx, types.NamespacedName{Name: l.Package, Namespace: l.config.Namespace}, &pm); err != nil {
41+
return nil, err
42+
}
43+
return []operator.PackageManifest{{PackageManifest: pm}}, nil
44+
}
45+
3846
pms := v1.PackageManifestList{}
39-
if err := l.config.Client.List(ctx, &pms, labelSelector); err != nil {
47+
if err := l.config.Client.List(ctx, &pms, labelSelector, client.InNamespace(l.config.Namespace)); err != nil {
4048
return nil, err
4149
}
4250
pkgs := make([]operator.PackageManifest, 0, len(pms.Items))
43-
for i := range pms.Items {
44-
if l.Package == "" || l.Package == pms.Items[i].GetName() {
45-
pkgs = append(pkgs, operator.PackageManifest{PackageManifest: pms.Items[i]})
46-
}
51+
for _, pm := range pms.Items {
52+
pkgs = append(pkgs, operator.PackageManifest{PackageManifest: pm})
4753
}
4854
return pkgs, nil
4955
}

0 commit comments

Comments
 (0)