Fix import cycle

Signed-off-by: Sam Lucidi <slucidi@redhat.com>

importer/manager.go

@@ -342,7 +342,11 @@ func (m *Manager) createApplication(imp *model.Import) (ok bool) {
 		return
 	}
 	// best effort
-	_ = m.discover(app)
+	err := m.discover(app)
+	if err != nil {
+		imp.ErrorMessage = fmt.Sprintf("Failed to launch discovery tasks for Application '%s'", app.Name)
+		return
+	}
 
 	ok = true
 	return

settings/hub.go

@@ -7,11 +7,12 @@ import (
 	"time"
 
 	liberr "github.com/jortel/go-utils/error"
-	"github.com/konveyor/tackle2-hub/k8s"
 	crd "github.com/konveyor/tackle2-hub/k8s/api/tackle/v1alpha2"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/selection"
+	"k8s.io/client-go/kubernetes/scheme"
 	k8sclient "sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/config"
 )
 
 const (
@@ -295,7 +296,12 @@ func (r *Hub) Load() (err error) {
 
 // discoveryTasks finds discovery tasks by their label
 func (r *Hub) discoveryTasks() (tasks []string, err error) {
-	client, err := k8s.NewClient()
+	cfg, _ := config.GetConfig()
+	client, err := k8sclient.New(
+		cfg,
+		k8sclient.Options{
+			Scheme: scheme.Scheme,
+		})
 	if err != nil {
 		err = liberr.Wrap(err)
 		return