Add Broker to clusterInfo

Since there are multiple places where a broker installation check on a cluster is needed in multiple places (show brokers, uninstall and recover-brokerinfo (soon)), add broker field as part of the clusterinfo and a function that checks if the cluster has Broker installed. This simplies code at multiple places. Depends on: submariner-io/submariner-operator#2432 Signed-off-by: Janki Chhatbar <[email protected]>
submariner-io · Jan 9, 2023 · a9b6afb · a9b6afb
1 parent 90accfb
commit a9b6afb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/internal/show/brokers.go b/internal/show/brokers.go
@@ -19,30 +19,22 @@ limitations under the License.
 package show
 
 import (
-	"context"
-
 	"github.com/submariner-io/admiral/pkg/reporter"
 	"github.com/submariner-io/subctl/internal/show/table"
 	"github.com/submariner-io/subctl/pkg/cluster"
-	"github.com/submariner-io/submariner-operator/api/v1alpha1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 func Brokers(clusterInfo *cluster.Info, _ string, status reporter.Interface) error {
 	status.Start("Detecting broker(s)")
 
-	brokerList := &v1alpha1.BrokerList{}
-	err := clusterInfo.ClientProducer.ForGeneral().List(context.TODO(), brokerList, client.InNamespace(metav1.NamespaceAll))
-
-	if err != nil && !apierrors.IsNotFound(err) {
-		return status.Error(err, "Error retrieving brokers")
+	brokers, err := clusterInfo.GetBrokers(metav1.NamespaceAll)
+	if err != nil {
+		return status.Error(err, "error retrieving broker")
 	}
 
 	status.End()
 
-	brokers := brokerList.Items
 	if len(brokers) == 0 {
 		status.Success("No brokers found")
 		return nil
@@ -70,8 +62,8 @@ func Brokers(clusterInfo *cluster.Info, _ string, status reporter.Interface) err
 		)
 	}
 
-	status.End()
 	printer.Print()
+	status.End()
 
 	return nil
 }
diff --git a/pkg/cluster/info.go b/pkg/cluster/info.go
@@ -174,3 +174,14 @@ func (c *Info) OperatorNamespace() string {
 
 	return constants.OperatorNamespace
 }
+
+func (c *Info) GetBrokers(namespace string) ([]v1alpha1.Broker, error) {
+	brokers := &v1alpha1.BrokerList{}
+	err := c.ClientProducer.ForGeneral().List(context.TODO(), brokers, controllerClient.InNamespace(namespace))
+
+	if err != nil && !apierrors.IsNotFound(err) && !meta.IsNoMatchError(err) {
+		return nil, errors.Wrapf(err, "error retrieving Broker in namespace %s", namespace)
+	}
+
+	return brokers.Items, nil
+}