Merge pull request #1487 from FabianKramm/main

fix: plugin v2 hooks
loft-sh · Jan 30, 2024 · acd9c71 · acd9c71
2 parents 8e72b5d + baae75d
commit acd9c71
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pkg/plugin/v2/plugin.go b/pkg/plugin/v2/plugin.go
@@ -116,6 +116,8 @@ func (m *Manager) Start(
 		if err != nil {
 			return fmt.Errorf("error adding client hook for plugin %s: %w", vClusterPlugin.Path, err)
 		}
+
+		klog.FromContext(ctx).Info("Successfully loaded plugin", "plugin", vClusterPlugin.Path)
 	}
 
 	return nil

diff --git a/pkg/util/pluginhookclient/client.go b/pkg/util/pluginhookclient/client.go
@@ -30,11 +30,11 @@ func NewVirtualPluginClientFactory(delegate client.NewClientFunc) client.NewClie
 }
 
 func NewPluginClient(virtual bool, delegate client.NewClientFunc) client.NewClientFunc {
-	if !plugin.DefaultManager.HasPlugins() {
-		return delegate
-	}
-
 	return func(config *rest.Config, options client.Options) (client.Client, error) {
+		if !plugin.DefaultManager.HasPlugins() {
+			return delegate(config, options)
+		}
+
 		innerClient, err := delegate(config, options)
 		if err != nil {
 			return nil, err