Enable AOT compatibility for Yarp.Kubernetes.Controller

YARP.slnx

@@ -54,6 +54,7 @@
   </Folder>
   <Folder Name="/testassets/">
     <Project Path="testassets/BenchmarkApp/BenchmarkApp.csproj" />
+    <Project Path="testassets/Kubernetes.AotCompatibility.TestApp/Yarp.Kubernetes.AotCompatibility.TestApp.csproj" />
     <Project Path="testassets/ReverseProxy.Code/ReverseProxy.Code.csproj" />
     <Project Path="testassets/ReverseProxy.Config/ReverseProxy.Config.csproj" />
     <Project Path="testassets/ReverseProxy.Direct/ReverseProxy.Direct.csproj" />

src/Kubernetes.Controller/Management/KubernetesReverseProxyServiceCollectionExtensions.cs

@@ -80,7 +80,7 @@
         services.AddHostedService<IngressController>();
         services.AddSingleton<ICache, IngressCache>();
         services.AddTransient<IReconciler, Reconciler>();
-        services.Configure<YarpOptions>(config.GetSection("Yarp"));
+        services.Configure<YarpOptions>(o => config.GetSection("Yarp").Bind(o));
 
         // Register the necessary Kubernetes resource informers
         services.RegisterResourceInformer<V1Ingress, V1IngressResourceInformer>();
@@ -112,7 +112,7 @@
         where TResource : class, IKubernetesObject<V1ObjectMeta>, new()
         where TService : IResourceInformer<TResource>
     {
         return services.RegisterResourceInformer<TResource, TService>(null);
     }
 
     /// <summary>

src/Kubernetes.Controller/Protocol/DispatchActionResult.cs

@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Yarp.Kubernetes.Controller.Protocol;
 using Yarp.Kubernetes.Protocol;
 
 namespace Yarp.Kubernetes.Controller.Dispatching;
@@ -54,7 +55,7 @@ public async Task ExecuteResultAsync(ActionContext context)
             var utf8Bytes = JsonSerializer.SerializeToUtf8Bytes(new Message
             {
                 MessageType = MessageType.Heartbeat
-            });
+            }, KubernetesJsonSerializerContext.Default.Message);
 
             while (!cancellationToken.IsCancellationRequested)
             {

src/Kubernetes.Controller/Protocol/DispatchConfigProvider.cs

@@ -34,7 +34,7 @@ public async Task UpdateAsync(IReadOnlyList<RouteConfig> routes, IReadOnlyList<C
             Routes = routes.ToList(),
         };
 
-        var bytes = JsonSerializer.SerializeToUtf8Bytes(message);
+        var bytes = JsonSerializer.SerializeToUtf8Bytes(message, KubernetesJsonSerializerContext.Default.Message);
 
         await _dispatcher.SendAsync(bytes, cancellationToken).ConfigureAwait(false);
     }

src/Kubernetes.Controller/Protocol/KubernetesJsonSerializerContext.cs

@@ -0,0 +1,16 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using Yarp.Kubernetes.Protocol;
+using Yarp.ReverseProxy.Configuration;
+
+namespace Yarp.Kubernetes.Controller.Protocol;
+
+[JsonSerializable(typeof(Message))]
+[JsonSerializable(typeof(List<RouteConfig>))]
+[JsonSerializable(typeof(List<ClusterConfig>))]
+internal sealed partial class KubernetesJsonSerializerContext : JsonSerializerContext
+{
+}

src/Kubernetes.Controller/Protocol/Message.cs

@@ -16,7 +16,7 @@ public enum MessageType
 
 public struct Message
 {
-    [JsonConverter(typeof(JsonStringEnumConverter))]
+    [JsonConverter(typeof(JsonStringEnumConverter<MessageType>))]
     public MessageType MessageType { get; set; }
 
     public string Key { get; set; }

src/Kubernetes.Controller/Protocol/Receiver.cs

@@ -12,6 +12,7 @@
 using Microsoft.Extensions.Options;
 using Yarp.Kubernetes.Controller.Configuration;
 using Yarp.Kubernetes.Controller.Hosting;
+using Yarp.Kubernetes.Controller.Protocol;
 using Yarp.Kubernetes.Controller.Rate;
 
 namespace Yarp.Kubernetes.Protocol;
@@ -65,7 +66,7 @@ public override async Task RunAsync(CancellationToken cancellationToken)
                         break;
                     }
 
-                    var message = System.Text.Json.JsonSerializer.Deserialize<Message>(json);
+                    var message = System.Text.Json.JsonSerializer.Deserialize<Message>(json, KubernetesJsonSerializerContext.Default.Message);
                     Logger.LogInformation("Received {MessageType} for {MessageKey}", message.MessageType, message.Key);
 
                     Logger.LogInformation(json);

src/Kubernetes.Controller/Services/Reconciler.cs

@@ -11,6 +11,7 @@
 using Yarp.Kubernetes.Controller.Client;
 using Yarp.Kubernetes.Controller.Configuration;
 using Yarp.Kubernetes.Controller.Converters;
+using Yarp.Kubernetes.Controller.Protocol;
 
 namespace Yarp.Kubernetes.Controller.Services;
 
@@ -63,8 +64,8 @@ public async Task ProcessAsync(CancellationToken cancellationToken)
 
             var clusters = configContext.BuildClusterConfig();
 
-            _logger.LogInformation(JsonSerializer.Serialize(configContext.Routes));
-            _logger.LogInformation(JsonSerializer.Serialize(clusters));
+            _logger.LogInformation(JsonSerializer.Serialize(configContext.Routes, KubernetesJsonSerializerContext.Default.ListRouteConfig));
+            _logger.LogInformation(JsonSerializer.Serialize(clusters, KubernetesJsonSerializerContext.Default.ListClusterConfig));
 
             await _updateConfig.UpdateAsync(configContext.Routes, clusters, cancellationToken).ConfigureAwait(false);
             await _ingressResourceStatusUpdater.UpdateStatusAsync(cancellationToken);

src/Kubernetes.Controller/Yarp.Kubernetes.Controller.csproj

@@ -7,6 +7,7 @@
     <NoWarn>$(NoWarn);CS8002</NoWarn>
     <IsPackable>true</IsPackable>
     <IsShipping>false</IsShipping>
+    <IsAotCompatible>true</IsAotCompatible>
     <PackageTags>yarp;dotnet;reverse-proxy;aspnetcore;kubernetes</PackageTags>
   </PropertyGroup>
 

testassets/Kubernetes.AotCompatibility.TestApp/Program.cs

@@ -0,0 +1,50 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+// This app is used to test AOT compatibility of all AOT-compatible YARP assemblies.
+// It exercises the main public API surface to ensure no AOT/trimming warnings
+// are emitted at build or publish time.
+
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using Yarp.Kubernetes.Protocol;
+
+// Combined controller scenario (ingress controller + YARP reverse proxy)
+{
+    var builder = WebApplication.CreateBuilder(args);
+    builder.WebHost.UseKubernetesReverseProxyCertificateSelector();
+    builder.Services.AddKubernetesReverseProxy(builder.Configuration);
+    _ = builder.Build();
+}
+
+// Monitor-only scenario (ingress monitor + dispatch controller)
+{
+    var builder = WebApplication.CreateBuilder(args);
+    builder.Services.AddKubernetesIngressMonitor(builder.Configuration);
+    builder.Services.AddControllers().AddKubernetesDispatchController();
+    _ = builder.Build();
+}
+
+// Receiver scenario (side-car that receives config from ingress monitor)
+{
+    var builder = WebApplication.CreateBuilder(args);
+    builder.Services.Configure<ReceiverOptions>(builder.Configuration.Bind);
+    builder.Services.AddHostedService<Receiver>();
+    builder.Services.AddReverseProxy().LoadFromMessages();
+    _ = builder.Build();
+}
+
+// ReverseProxy standalone scenario
+{
+    var builder = WebApplication.CreateBuilder(args);
+    builder.Services.AddReverseProxy()
+        .LoadFromConfig(builder.Configuration.GetSection("ReverseProxy"));
+    _ = builder.Build();
+}
+
+// TelemetryConsumption scenario
+{
+    var builder = WebApplication.CreateBuilder(args);
+    builder.Services.AddTelemetryListeners();
+    _ = builder.Build();
+}

testassets/Kubernetes.AotCompatibility.TestApp/Yarp.Kubernetes.AotCompatibility.TestApp.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <PublishAot>true</PublishAot>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Kubernetes.Controller\Yarp.Kubernetes.Controller.csproj" />
+    <ProjectReference Include="..\..\src\ReverseProxy\Yarp.ReverseProxy.csproj" />
+    <ProjectReference Include="..\..\src\TelemetryConsumption\Yarp.Telemetry.Consumption.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <TrimmerRootAssembly Include="Yarp.Kubernetes.Controller" />
+    <TrimmerRootAssembly Include="Yarp.ReverseProxy" />
+    <TrimmerRootAssembly Include="Yarp.Telemetry.Consumption" />
+  </ItemGroup>
+
+</Project>