Refactor plugin manifest and patching api types; use manifest in plug…

…in loader client to verify plugins before loading

apis/core/v1beta1/gateway_types.go

@@ -38,8 +38,10 @@ type OpenIDConfigSpec struct {
 type GatewaySpec struct {
 	Image *opnimeta.ImageSpec `json:"image,omitempty"`
 	//+kubebuilder:validation:Required
-	Auth             AuthSpec `json:"auth,omitempty"`
-	Hostname         string   `json:"hostname,omitempty"`
+	Auth     AuthSpec `json:"auth,omitempty"`
+	Hostname string   `json:"hostname,omitempty"`
+
+	// Deprecated: this field is ignored.
 	PluginSearchDirs []string `json:"pluginSearchDirs,omitempty"`
 
 	Alerting AlertingSpec                `json:"alerting,omitempty"`

apis/monitoring/v1beta1/core_types.go

@@ -19,20 +19,6 @@ type BootstrapTokenList struct {
 	Items           []BootstrapToken `json:"items"`
 }
 
-// +kubebuilder:object:root=true
-type Cluster struct {
-	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
-	Spec              *opnicorev1.Cluster `json:"spec,omitempty"`
-}
-
-// +kubebuilder:object:root=true
-type ClusterList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Cluster `json:"items"`
-}
-
 // +kubebuilder:object:root=true
 type Role struct {
 	metav1.TypeMeta   `json:",inline"`
@@ -78,7 +64,6 @@ type KeyringList struct {
 func init() {
 	SchemeBuilder.Register(
 		&BootstrapToken{}, &BootstrapTokenList{},
-		&Cluster{}, &ClusterList{},
 		&Role{}, &RoleList{},
 		&RoleBinding{}, &RoleBindingList{},
 		&Keyring{}, &KeyringList{},

config/crd/kustomization.yaml

@@ -28,7 +28,6 @@ resources:
 - bases/logging.opni.io_multiclusterusers.yaml
 - bases/logging.opni.io_opniopensearches.yaml
 - bases/monitoring.opni.io_bootstraptokens.yaml
-- bases/monitoring.opni.io_clusters.yaml
 - bases/monitoring.opni.io_keyrings.yaml
 - bases/monitoring.opni.io_rolebindings.yaml
 - bases/monitoring.opni.io_roles.yaml

internal/ginkgo/run.cue

@@ -27,7 +27,7 @@ import (
 	}
 	Build: {
 		Race:                 bool | *true
-		Cover:                true
+		Cover:                bool | *true
 		CoverMode:            string | *"atomic"
 		CoverPkg:             string | *""
 		Vet:                  string | *""

pkg/agent/v2/agent.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net"
 	"net/http"
-	"path"
 	"strings"
 	"sync"
 	"time"
@@ -273,14 +272,14 @@ func New(ctx context.Context, conf *v1beta1.AgentConfig, opts ...AgentOption) (*
 
 	pl.Hook(hooks.OnLoadMC(func(hc controlv1.HealthClient, m meta.PluginMeta, cc *grpc.ClientConn) {
 		client := controlv1.NewHealthClient(cc)
-		hm.AddClient(path.Base(m.BinaryPath), client)
+		hm.AddClient(m.Filename(), client)
 	}))
 
 	pl.Hook(hooks.OnLoadMC(func(ext types.StreamAPIExtensionPlugin, md meta.PluginMeta, cc *grpc.ClientConn) {
 		lg.With(
 			zap.String("plugin", md.Module),
 		).Debug("loaded stream api extension plugin")
-		gatewayClient.RegisterSplicedStream(cc, md.ShortName())
+		gatewayClient.RegisterSplicedStream(cc, md.Filename())
 	}))
 
 	return &Agent{
@@ -355,7 +354,9 @@ func (a *Agent) ListenAndServe(ctx context.Context) error {
 			close(done)
 		}))
 
-		a.pluginLoader.LoadPlugins(ctx, a.config.Plugins, plugins.AgentScheme)
+		a.pluginLoader.LoadPlugins(ctx, a.config.Plugins, plugins.AgentScheme,
+			plugins.WithManifest(manifests),
+		)
 
 		select {
 		case <-done:
@@ -410,7 +411,7 @@ func setupPluginRoutes(
 	).Named("api")
 	forwarder := fwd.To(cfg.HttpAddr,
 		fwd.WithLogger(sampledLogger),
-		fwd.WithDestHint(path.Base(pluginMeta.BinaryPath)),
+		fwd.WithDestHint(pluginMeta.Filename()),
 	)
 ROUTES:
 	for _, route := range cfg.Routes {
@@ -490,12 +491,12 @@ func (a *Agent) syncPlugins(ctx context.Context) (_ *controlv1.PluginManifest, r
 
 	manifestClient := controlv1.NewPluginSyncClient(a.gatewayClient.ClientConn())
 	// read local plugins on disk here
-	localManifests, err := patch.GetFilesystemPlugins(a.config.Plugins, a.Logger)
+	archive, err := patch.GetFilesystemPlugins(a.config.Plugins, a.Logger)
 	if err != nil {
 		return nil, err
 	}
 
-	patchList, err := manifestClient.SyncPluginManifest(ctx, localManifests, grpc.UseCompressor("zstd"))
+	syncResp, err := manifestClient.SyncPluginManifest(ctx, archive.ToManifest(), grpc.UseCompressor("zstd"))
 	if err != nil {
 		return nil, err
 	}
@@ -505,15 +506,10 @@ func (a *Agent) syncPlugins(ctx context.Context) (_ *controlv1.PluginManifest, r
 	if err != nil {
 		return nil, err
 	}
-	if err := patchClient.Patch(patchList); err != nil {
-		return nil, err
-	}
-
-	// read local manifests again
-	localManifests, err = patch.GetFilesystemPlugins(a.config.Plugins, a.Logger)
+	err = patchClient.Patch(syncResp.RequiredPatches)
 	if err != nil {
 		return nil, err
 	}
 
-	return localManifests, nil
+	return syncResp.DesiredState, nil
 }

pkg/agent/v2/v2_suite_test.go

@@ -9,5 +9,5 @@ import (
 
 func TestV2(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "V2 Suite")
+	RunSpecs(t, "Agent V2 Suite")
 }