Simplify Aspire multi-replica configuration (#236)

Author: Aaronontheweb

src/DrawTogether.AppHost/AkkaManagementExtensions.cs

@@ -31,6 +31,7 @@ public static IResourceBuilder<ProjectResource> ConfigureAkkaManagementForApp(th
             .WithEnvironment("AkkaSettings__RemoteOptions__PublicHostName", "localhost")
             .WithEnvironment("AkkaSettings__AkkaManagementOptions__Enabled", "true")
             .WithEnvironment("AkkaSettings__AkkaManagementOptions__DiscoveryMethod", "AzureTableStorage")
+            .WithEnvironment("AkkaSettings__AkkaManagementOptions__RequiredContactPointsNr", config.Replicas.ToString())
             .WithEnvironment("AkkaSettings__AkkaManagementOptions__FilterOnFallbackPort", "false");
 
         return appBuilder;
@@ -68,7 +69,7 @@ public static IResourceBuilder<ContainerResource> ConfigureAkkaManagementForApp(
         appBuilder
             .WithEnvironment("AkkaSettings__AkkaManagementOptions__Enabled", "true")
             .WithEnvironment("AkkaSettings__AkkaManagementOptions__DiscoveryMethod", "AzureTableStorage")
-            .WithEnvironment("AkkaSettings__AkkaManagementOptions__RequiredContactPointsNr", "1")
+            .WithEnvironment("AkkaSettings__AkkaManagementOptions__RequiredContactPointsNr", config.Replicas.ToString())
             .WithEnvironment("AkkaSettings__AkkaManagementOptions__FilterOnFallbackPort", "false");
 
         return appBuilder;

src/DrawTogether.AppHost/Configuration.cs

@@ -23,6 +23,4 @@ public class DrawTogetherConfiguration
     /// Only relevant when <see cref="UseAkkaManagement"/> is enabled.
     /// </summary>
     public int Replicas { get; set; } = 1;
-
-    public DeployEnvironment DeployEnvironment { get; set; } = DeployEnvironment.Local;
 }

src/DrawTogether.AppHost/DeployEnvironment.cs

@@ -28,38 +28,15 @@
     .WaitFor(db)
     .WithReference(db);
 
-if (drawTogetherAspireConfig.DeployEnvironment == DeployEnvironment.Docker)
-{
-    var drawTogether = builder.AddDockerfile("DrawTogether-1", "../../", "./src/DrawTogether/DockerFile")
-        .WithImage("draw-together", "latest")
-        .WithReference(db, "DefaultConnection")
-        .ConfigureAkkaManagementForApp(drawTogetherAspireConfig)
-        .WaitForCompletion(migrationService);
-
-    foreach (var index in Enumerable.Range(2, drawTogetherAspireConfig.Replicas - 1))
-    {
-        builder.AddContainer($"DrawTogether-{index}", "draw-together")
-            .WithReference(db, "DefaultConnection")
-            .ConfigureAkkaManagementForApp(drawTogetherAspireConfig)
-            .WaitFor(drawTogether);
-    }
-    
-    // https://github.com/petabridge/pbm-sidecar - used to run `pbm` commands on the DrawTogether actor system
-    var pbmSidecar = builder.AddContainer("pbm-sidecar", "petabridge/pbm:latest")
-        .WaitFor(drawTogether);
-}
-else
-{
-    var drawTogether = builder.AddProject<Projects.DrawTogether>("DrawTogether")
-        .WithReplicas(drawTogetherAspireConfig.Replicas)
-        .WithReference(db, "DefaultConnection")
-        .WaitForCompletion(migrationService)
-        .ConfigureAkkaManagementForApp(drawTogetherAspireConfig);
-
-    // https://github.com/petabridge/pbm-sidecar - used to run `pbm` commands on the DrawTogether actor system
-    var pbmSidecar = builder.AddContainer("pbm-sidecar", "petabridge/pbm:latest")
-        .WaitFor(drawTogether);
-}
+var drawTogether = builder.AddProject<Projects.DrawTogether>("DrawTogether")
+    .WithReplicas(drawTogetherAspireConfig.Replicas)
+    .WithReference(db, "DefaultConnection")
+    .WaitForCompletion(migrationService)
+    .ConfigureAkkaManagementForApp(drawTogetherAspireConfig);
+
+// https://github.com/petabridge/pbm-sidecar - used to run `pbm` commands on the DrawTogether actor system
+var pbmSidecar = builder.AddContainer("pbm-sidecar", "petabridge/pbm:latest")
+    .WaitFor(drawTogether);
 
 builder
     .Build()

src/DrawTogether.AppHost/Program.cs

@@ -4,8 +4,5 @@
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning"
     }
-  },
-  "DrawTogether": {
-    "DeployEnvironment": "Local"
   }
 }

src/DrawTogether.AppHost/appsettings.Development.json

@@ -9,7 +9,6 @@
   "DrawTogether": {
     "UseVolumes": true,
     "UseAkkaManagement": true,
-    "Replicas": 3,
-    "DeployEnvironment": "Docker"
+    "Replicas": 3
   }
 }

src/DrawTogether.AppHost/appsettings.json

@@ -90,6 +90,7 @@ public static AkkaConfigurationBuilder ConfigureNetwork(this AkkaConfigurationBu
                     options.ContactPointDiscovery.PortName = settings.AkkaManagementOptions.PortName;
                     options.ContactPointDiscovery.RequiredContactPointsNr = settings.AkkaManagementOptions.RequiredContactPointsNr;
                     options.ContactPointDiscovery.ContactWithAllContactPoints = true;
+                    options.ContactPointDiscovery.StableMargin = TimeSpan.FromSeconds(5);
 
                     options.ContactPoint.FilterOnFallbackPort = settings.AkkaManagementOptions.FilterOnFallbackPort;
                 }, autoStart: true);

src/DrawTogether/Config/AkkaConfiguration.cs

@@ -13,7 +13,8 @@ public async Task InitializeAsync()
     {
         var builder = await DistributedApplicationTestingBuilder.CreateAsync<Projects.DrawTogether_AppHost>([
             "DrawTogether:UseVolumes=false",
-            "DrawTogether:UseAkkaManagement=false"
+            "DrawTogether:UseAkkaManagement=false",
+            "DrawTogether:Replicas=1"
         ]);
 
         _app = await builder.BuildAsync();