feat: Add MSAF framework support

Author: g3force

api/v1alpha1/agent_types.go

@@ -104,7 +104,7 @@ type AgentTool struct {
 // AgentSpec defines the desired state of Agent.
 type AgentSpec struct {
 	// Framework defines the supported agent frameworks
-	// +kubebuilder:validation:Enum=google-adk;custom
+	// +kubebuilder:validation:Enum=google-adk;msaf;custom
 	// +optional
 	Framework string `json:"framework,omitempty"`
 

api/v1alpha1/agentruntimeconfiguration_types.go

@@ -35,9 +35,10 @@ type AgentTemplateImages struct {
 	// +optional
 	GoogleAdk string `json:"googleAdk,omitempty"`
 
-	// Additional framework images can be added here in the future, e.g.:
-	// LangChain string `json:"langChain,omitempty"`
-	// CrewAI string `json:"crewAi,omitempty"`
+	// Msaf is the template image for the Microsoft Agent Framework (MSAF).
+	// If not specified, the operator's built-in default will be used.
+	// +optional
+	Msaf string `json:"msaf,omitempty"`
 }
 
 // AgentRuntimeConfigurationStatus defines the observed state of AgentRuntimeConfiguration.
@@ -50,6 +51,7 @@ type AgentRuntimeConfigurationStatus struct {
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Google ADK Image",type=string,JSONPath=`.spec.agentTemplateImages.googleAdk`
+// +kubebuilder:printcolumn:name="MSAF Image",type=string,JSONPath=`.spec.agentTemplateImages.msaf`
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 
 // AgentRuntimeConfiguration is the Schema for the agentruntimeconfigurations API.

config/crd/bases/runtime.agentic-layer.ai_agentruntimeconfigurations.yaml

@@ -18,6 +18,9 @@ spec:
     - jsonPath: .spec.agentTemplateImages.googleAdk
       name: Google ADK Image
       type: string
+    - jsonPath: .spec.agentTemplateImages.msaf
+      name: MSAF Image
+      type: string
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
@@ -59,6 +62,11 @@ spec:
                       GoogleAdk is the template image for the Google ADK framework.
                       If not specified, the operator's built-in default will be used.
                     type: string
+                  msaf:
+                    description: |-
+                      Msaf is the template image for the Microsoft Agent Framework (MSAF).
+                      If not specified, the operator's built-in default will be used.
+                    type: string
                 type: object
             type: object
           status:

config/crd/bases/runtime.agentic-layer.ai_agents.yaml

@@ -329,6 +329,7 @@ spec:
                 description: Framework defines the supported agent frameworks
                 enum:
                 - google-adk
+                - msaf
                 - custom
                 type: string
               image:

config/samples/runtime_v1alpha1_agentruntimeconfiguration.yaml

@@ -8,3 +8,5 @@ spec:
     # Customize the default template image for Google ADK framework agents
     # This will be used when an Agent resource does not specify a custom image
     googleAdk: "ghcr.io/agentic-layer/agent-template-adk:0.8.0"
+    # Customize the default template image for Microsoft Agent Framework (MSAF) agents
+    msaf: "ghcr.io/agentic-layer/agent-template-msaf:0.1.0"

internal/controller/agent_reconciler.go

@@ -44,7 +44,9 @@ const (
 	agentContainerName           = "agent"
 	agentCardEndpoint            = "/.well-known/agent-card.json"
 	googleAdkFramework           = "google-adk"
+	msafFramework                = "msaf"
 	defaultTemplateImageAdk      = "ghcr.io/agentic-layer/agent-template-adk:0.8.0"
+	defaultTemplateImageMsaf     = "ghcr.io/agentic-layer/agent-template-msaf:0.1.0"
 	defaultTemplateImageFallback = "invalid"
 )
 
@@ -490,13 +492,19 @@ func (r *AgentReconciler) getTemplateImage(framework string, config *runtimev1al
 			if config.Spec.AgentTemplateImages.GoogleAdk != "" {
 				return config.Spec.AgentTemplateImages.GoogleAdk
 			}
+		case msafFramework:
+			if config.Spec.AgentTemplateImages.Msaf != "" {
+				return config.Spec.AgentTemplateImages.Msaf
+			}
 		}
 	}
 
 	// Fall back to built-in defaults
 	switch framework {
 	case googleAdkFramework:
 		return defaultTemplateImageAdk
+	case msafFramework:
+		return defaultTemplateImageMsaf
 	default:
 		// Validation will catch unsupported frameworks without images
 		// This shouldn't be reached due to validation, but set template as fallback

internal/webhook/v1alpha1/agent_webhook.go

@@ -34,6 +34,7 @@ import (
 
 const (
 	googleAdkFramework = "google-adk"
+	msafFramework      = "msaf"
 )
 
 // agentlog is for logging in this package.
@@ -54,6 +55,7 @@ func SetupAgentWebhookWithManager(mgr ctrl.Manager) error {
 			DefaultReplicas:      1,
 			DefaultPort:          8080,
 			DefaultPortGoogleAdk: 8000,
+			DefaultPortMsaf:      8000,
 			Recorder:             mgr.GetEventRecorder("agent-defaulter-webhook"),
 		}).
 		WithValidator(&AgentCustomValidator{}).
@@ -72,6 +74,7 @@ type AgentCustomDefaulter struct {
 	DefaultReplicas      int32
 	DefaultPort          int32
 	DefaultPortGoogleAdk int32
+	DefaultPortMsaf      int32
 	Recorder             events.EventRecorder
 }
 
@@ -119,6 +122,8 @@ func (d *AgentCustomDefaulter) frameworkDefaultPort(framework string) int32 {
 	switch framework {
 	case googleAdkFramework:
 		return d.DefaultPortGoogleAdk
+	case msafFramework:
+		return d.DefaultPortMsaf
 	default:
 		return d.DefaultPort // Default port for unknown frameworks
 	}
@@ -159,11 +164,15 @@ func (v *AgentCustomValidator) validateAgent(agent *runtimev1alpha1.Agent) (admi
 	var allErrs field.ErrorList
 
 	// Validate framework and image combination
-	if agent.Spec.Image == "" && agent.Spec.Framework != googleAdkFramework {
+	templateFrameworks := map[string]bool{
+		googleAdkFramework: true,
+		msafFramework:      true,
+	}
+	if agent.Spec.Image == "" && !templateFrameworks[agent.Spec.Framework] {
 		allErrs = append(allErrs, field.Invalid(
 			field.NewPath("spec", "framework"),
 			agent.Spec.Framework,
-			fmt.Sprintf("framework %q requires a custom image. Template agents are only supported for %q framework", agent.Spec.Framework, googleAdkFramework),
+			fmt.Sprintf("framework %q requires a custom image. Template agents are only supported for frameworks: %s", agent.Spec.Framework, "google-adk, msaf"),
 		))
 	}
 

internal/webhook/v1alpha1/agent_webhook_test.go

@@ -319,7 +319,7 @@ var _ = Describe("Agent Webhook", func() {
 				By("verifying that validation fails")
 				Expect(err).To(HaveOccurred())
 				Expect(err.Error()).To(ContainSubstring("framework \"custom\" requires a custom image"))
-				Expect(err.Error()).To(ContainSubstring("Template agents are only supported for \"google-adk\" framework"))
+				Expect(err.Error()).To(ContainSubstring("Template agents are only supported for frameworks: google-adk, msaf"))
 				Expect(warnings).To(BeEmpty())
 			})