Merge branch 'main' into release-0.9

Author: jortel

OWNERS.md

@@ -0,0 +1,8 @@
+reviewers:
+  - aufi
+  - jortel
+approvers:
+  - aufi
+  - dymurray
+  - jmontleon
+  - jortel

cmd/main.go

@@ -11,7 +11,6 @@ import (
 	"github.com/jortel/go-utils/logr"
 	"github.com/konveyor/tackle2-hub/internal/api"
 	"github.com/konveyor/tackle2-hub/internal/auth"
-	"github.com/konveyor/tackle2-hub/internal/controller"
 	"github.com/konveyor/tackle2-hub/internal/database"
 	"github.com/konveyor/tackle2-hub/internal/heap"
 	"github.com/konveyor/tackle2-hub/internal/importer"
@@ -30,8 +29,6 @@ import (
 	"github.com/konveyor/tackle2-hub/shared/ssh"
 	"gorm.io/gorm"
 	"k8s.io/client-go/kubernetes/scheme"
-	"sigs.k8s.io/controller-runtime/pkg/client/config"
-	"sigs.k8s.io/controller-runtime/pkg/manager"
 )
 
 var (
@@ -72,31 +69,6 @@ func buildScheme() (err error) {
 	return
 }
 
-// addonManager
-func addonManager(db *gorm.DB) (mgr manager.Manager, err error) {
-	cfg, err := config.GetConfig()
-	if err != nil {
-		err = liberr.Wrap(err)
-		return
-	}
-	mgr, err = manager.New(
-		cfg,
-		manager.Options{
-			MetricsBindAddress: "0",
-			Namespace:          Settings.Hub.Namespace,
-		})
-	if err != nil {
-		err = liberr.Wrap(err)
-		return
-	}
-	err = controller.Add(mgr, db)
-	if err != nil {
-		err = liberr.Wrap(err)
-		return
-	}
-	return
-}
-
 // main.
 func main() {
 	Log.Info("Started:\n" + Settings.String())
@@ -115,28 +87,26 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	if !Settings.Disconnected {
-		//
-		// k8s scheme.
-		err = buildScheme()
+	//
+	// k8s scheme.
+	err = buildScheme()
+	if err != nil {
+		return
+	}
+	//
+	// Add controller manager.
+	addonManager, aErr := k8s.NewManager(db)
+	if aErr != nil {
+		err = aErr
+		return
+	}
+	go func() {
+		err = addonManager.Start(context.Background())
 		if err != nil {
+			err = liberr.Wrap(err)
 			return
 		}
-		//
-		// Add controller.
-		addonManager, aErr := addonManager(db)
-		if aErr != nil {
-			err = aErr
-			return
-		}
-		go func() {
-			err = addonManager.Start(context.Background())
-			if err != nil {
-				err = liberr.Wrap(err)
-				return
-			}
-		}()
-	}
+	}()
 	//
 	// k8s client.
 	client, err := k8s.NewClient()

internal/api/jsd/validation.go

@@ -25,9 +25,6 @@ type Validator struct {
 
 // Validate validates the specified document based on schema.
 func (v *Validator) Validate(r any) (err error) {
-	if Settings.Hub.Disconnected {
-		return
-	}
 	fields := v.fields(r)
 	for _, f := range fields {
 		if f != nil {

internal/jsd/manager.go

@@ -32,9 +32,6 @@ func (m *Manager) Load() (err error) {
 	}
 	m.domains = make(map[string]Schema)
 	m.names = make(map[string]Schema)
-	if Settings.Disconnected {
-		return
-	}
 	list := &crd.SchemaList{}
 	err = m.Client.List(
 		context.TODO(),

internal/k8s/client.go

@@ -0,0 +1,113 @@
+package fake
+
+import (
+	"context"
+	"net/http"
+
+	"github.com/go-logr/logr"
+	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/client-go/rest"
+	"k8s.io/client-go/tools/record"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/config/v1alpha1"
+	"sigs.k8s.io/controller-runtime/pkg/healthz"
+	"sigs.k8s.io/controller-runtime/pkg/manager"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
+)
+
+// Manager is a no-op manager for testing/disconnected mode.
+// It implements the manager.Manager interface but does nothing.
+type Manager struct {
+	client client.Client
+}
+
+// NewManager creates a new fake manager with the given client.
+func NewManager(client client.Client) *Manager {
+	return &Manager{
+		client: client,
+	}
+}
+
+// GetClient returns the client.
+func (m *Manager) GetClient() (c client.Client) {
+	c = m.client
+	return
+}
+
+// GetAPIReader returns the client (same as GetClient for fake).
+func (m *Manager) GetAPIReader() (r client.Reader) {
+	r = m.client
+	return
+}
+
+// Start blocks until the context is canceled (like a real manager).
+func (m *Manager) Start(ctx context.Context) (err error) {
+	<-ctx.Done()
+	return
+}
+
+func (m *Manager) GetConfig() (cfg *rest.Config) {
+	return
+}
+
+func (m *Manager) GetScheme() (s *runtime.Scheme) {
+	return
+}
+
+func (m *Manager) GetRESTMapper() (mapper meta.RESTMapper) {
+	return
+}
+
+func (m *Manager) GetCache() (c cache.Cache) {
+	return
+}
+
+func (m *Manager) GetEventRecorderFor(name string) (recorder record.EventRecorder) {
+	return
+}
+
+func (m *Manager) GetFieldIndexer() (indexer client.FieldIndexer) {
+	return
+}
+
+func (m *Manager) Add(manager.Runnable) (err error) {
+	return
+}
+
+func (m *Manager) Elected() (ch <-chan struct{}) {
+	closed := make(chan struct{})
+	close(closed)
+	ch = closed
+	return
+}
+
+func (m *Manager) AddMetricsExtraHandler(path string, handler http.Handler) (err error) {
+	return
+}
+
+func (m *Manager) AddHealthzCheck(name string, check healthz.Checker) (err error) {
+	return
+}
+
+func (m *Manager) AddReadyzCheck(name string, check healthz.Checker) (err error) {
+	return
+}
+
+func (m *Manager) GetWebhookServer() (server *webhook.Server) {
+	return
+}
+
+func (m *Manager) GetLogger() (log logr.Logger) {
+	log = logr.Discard()
+	return
+}
+
+func (m *Manager) GetControllerOptions() (spec v1alpha1.ControllerConfigurationSpec) {
+	return
+}
+
+func (m *Manager) SetFields(interface{}) (err error) {
+	return
+}