Add OLMv1 wrapper, MCP tools, upgrade & tests

Signed-off-by: Brett Tofel <btofel@redhat.com>

Author: bentito

.gitignore

@@ -27,3 +27,4 @@ python/build/
 python/dist/
 python/kubernetes_mcp_server.egg-info/
 !python/kubernetes-mcp-server
+/kubernetes-mcp-server.iml

pkg/kubernetes/kubernetes.go

@@ -22,6 +22,7 @@ import (
 
 	"github.com/containers/kubernetes-mcp-server/pkg/config"
 	"github.com/containers/kubernetes-mcp-server/pkg/helm"
+	"github.com/containers/kubernetes-mcp-server/pkg/olm"
 
 	_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
 )
@@ -212,3 +213,8 @@ func (k *Kubernetes) NewHelm() *helm.Helm {
 	// This is a derived Kubernetes, so it already has the Helm initialized
 	return helm.NewHelm(k.manager)
 }
+
+func (k *Kubernetes) NewOlm() *olm.Olm {
+	// Provide an OLM wrapper backed by the manager
+	return olm.NewOlm(k.manager)
+}

pkg/mcp/olm.go

@@ -0,0 +1,117 @@
+package mcp
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/mark3labs/mcp-go/server"
+)
+
+func (s *Server) initOlm() []server.ServerTool {
+	return []server.ServerTool{
+		{Tool: mcp.NewTool("olm_install",
+			mcp.WithDescription("Install an OLMv1 ClusterExtension resource from a manifest (YAML or JSON)"),
+			mcp.WithString("manifest", mcp.Description("ClusterExtension manifest to create or update (YAML or JSON)"), mcp.Required()),
+			// Tool annotations
+			mcp.WithTitleAnnotation("OLM: Install"),
+			mcp.WithReadOnlyHintAnnotation(false),
+			mcp.WithDestructiveHintAnnotation(false),
+			mcp.WithIdempotentHintAnnotation(false),
+			mcp.WithOpenWorldHintAnnotation(true),
+		), Handler: s.olmInstall},
+		{Tool: mcp.NewTool("olm_list",
+			mcp.WithDescription("List OLMv1 ClusterExtension resources in the cluster"),
+			// Tool annotations
+			mcp.WithTitleAnnotation("OLM: List"),
+			mcp.WithReadOnlyHintAnnotation(true),
+			mcp.WithDestructiveHintAnnotation(false),
+			mcp.WithOpenWorldHintAnnotation(true),
+		), Handler: s.olmList},
+		{Tool: mcp.NewTool("olm_uninstall",
+			mcp.WithDescription("Uninstall (delete) an OLMv1 ClusterExtension resource by name"),
+			mcp.WithString("name", mcp.Description("Name of the ClusterExtension to delete"), mcp.Required()),
+			// Tool annotations
+			mcp.WithTitleAnnotation("OLM: Uninstall"),
+			mcp.WithReadOnlyHintAnnotation(false),
+			mcp.WithDestructiveHintAnnotation(true),
+			mcp.WithIdempotentHintAnnotation(true),
+			mcp.WithOpenWorldHintAnnotation(true),
+		), Handler: s.olmUninstall},
+		{Tool: mcp.NewTool("olm_upgrade",
+			mcp.WithDescription("Upgrade (update) an existing OLMv1 ClusterExtension resource by name using a manifest"),
+			mcp.WithString("name", mcp.Description("Name of the ClusterExtension to upgrade"), mcp.Required()),
+			mcp.WithString("manifest", mcp.Description("Manifest to apply to the ClusterExtension (YAML or JSON)"), mcp.Required()),
+			// Tool annotations
+			mcp.WithTitleAnnotation("OLM: Upgrade"),
+			mcp.WithReadOnlyHintAnnotation(false),
+			mcp.WithDestructiveHintAnnotation(false),
+			mcp.WithIdempotentHintAnnotation(true),
+			mcp.WithOpenWorldHintAnnotation(true),
+		), Handler: s.olmUpgrade},
+	}
+}
+
+func (s *Server) olmInstall(ctx context.Context, ctr mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	manifest, ok := ctr.GetArguments()["manifest"].(string)
+	if !ok || manifest == "" {
+		return NewTextResult("", fmt.Errorf("missing argument manifest")), nil
+	}
+	derived, err := s.k.Derived(ctx)
+	if err != nil {
+		return nil, err
+	}
+	ret, err := derived.NewOlm().Install(ctx, manifest)
+	if err != nil {
+		return NewTextResult("", fmt.Errorf("failed to install ClusterExtension: %w", err)), nil
+	}
+	return NewTextResult(ret, nil), nil
+}
+
+func (s *Server) olmList(ctx context.Context, ctr mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	derived, err := s.k.Derived(ctx)
+	if err != nil {
+		return nil, err
+	}
+	ret, err := derived.NewOlm().List(ctx)
+	if err != nil {
+		return NewTextResult("", fmt.Errorf("failed to list ClusterExtensions: %w", err)), nil
+	}
+	return NewTextResult(ret, nil), nil
+}
+
+func (s *Server) olmUninstall(ctx context.Context, ctr mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	name, ok := ctr.GetArguments()["name"].(string)
+	if !ok || name == "" {
+		return NewTextResult("", fmt.Errorf("missing argument name")), nil
+	}
+	derived, err := s.k.Derived(ctx)
+	if err != nil {
+		return nil, err
+	}
+	ret, err := derived.NewOlm().Uninstall(ctx, name)
+	if err != nil {
+		return NewTextResult("", fmt.Errorf("failed to uninstall ClusterExtension: %w", err)), nil
+	}
+	return NewTextResult(ret, nil), nil
+}
+
+func (s *Server) olmUpgrade(ctx context.Context, ctr mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	name, ok := ctr.GetArguments()["name"].(string)
+	if !ok || name == "" {
+		return NewTextResult("", fmt.Errorf("missing argument name")), nil
+	}
+	manifest, ok := ctr.GetArguments()["manifest"].(string)
+	if !ok || manifest == "" {
+		return NewTextResult("", fmt.Errorf("missing argument manifest")), nil
+	}
+	derived, err := s.k.Derived(ctx)
+	if err != nil {
+		return nil, err
+	}
+	ret, err := derived.NewOlm().Upgrade(ctx, name, manifest)
+	if err != nil {
+		return NewTextResult("", fmt.Errorf("failed to upgrade ClusterExtension: %w", err)), nil
+	}
+	return NewTextResult(ret, nil), nil
+}

pkg/mcp/olm_test.go

@@ -0,0 +1,20 @@
+package mcp
+
+import (
+	"testing"
+)
+
+func TestInitOlmTools(t *testing.T) {
+	s := &Server{}
+	tools := s.initOlm()
+	if len(tools) != 4 {
+		t.Fatalf("expected 4 tools, got %d", len(tools))
+	}
+	names := map[string]bool{}
+	for _, t := range tools {
+		names[t.Tool.Name] = true
+	}
+	if !names["olm_install"] || !names["olm_list"] || !names["olm_uninstall"] || !names["olm_upgrade"] {
+		t.Fatalf("missing expected olm tool names: %v", names)
+	}
+}

pkg/mcp/profiles.go

@@ -43,6 +43,7 @@ func (p *FullProfile) GetTools(s *Server) []server.ServerTool {
 		s.initPods(),
 		s.initResources(),
 		s.initHelm(),
+		s.initOlm(),
 	)
 }