Skip to content

Commit 500be3e

Browse files
authored
Remove unused replica set code from DcpExecutor (#7280)
1 parent 3342152 commit 500be3e

File tree

1 file changed

+3
-21
lines changed

1 file changed

+3
-21
lines changed

src/Aspire.Hosting/Dcp/DcpExecutor.cs

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -712,13 +712,13 @@ private async Task CreateContainerNetworksAsync(CancellationToken cancellationTo
712712

713713
private async Task CreateContainersAndExecutablesAsync(CancellationToken cancellationToken)
714714
{
715-
var toCreate = _appResources.Where(r => r.DcpResource is Container || r.DcpResource is Executable || r.DcpResource is ExecutableReplicaSet);
715+
var toCreate = _appResources.Where(r => r.DcpResource is Container || r.DcpResource is Executable);
716716
AddAllocatedEndpointInfo(toCreate);
717717

718718
await _executorEvents.PublishAsync(new OnEndpointsAllocatedContext(cancellationToken)).ConfigureAwait(false);
719719

720720
var containersTask = CreateContainersAsync(toCreate.Where(ar => ar.DcpResource is Container), cancellationToken);
721-
var executablesTask = CreateExecutablesAsync(toCreate.Where(ar => ar.DcpResource is Executable || ar.DcpResource is ExecutableReplicaSet), cancellationToken);
721+
var executablesTask = CreateExecutablesAsync(toCreate.Where(ar => ar.DcpResource is Executable), cancellationToken);
722722

723723
await Task.WhenAll(containersTask, executablesTask).ConfigureAwait(false);
724724
}
@@ -1022,12 +1022,8 @@ private async Task CreateExecutableAsync(AppResource er, ILogger resourceLogger,
10221022
spec = exe.Spec;
10231023
createResource = async () => await _kubernetesService.CreateAsync(exe, cancellationToken).ConfigureAwait(false);
10241024
break;
1025-
case ExecutableReplicaSet ers:
1026-
spec = ers.Spec.Template.Spec;
1027-
createResource = async () => await _kubernetesService.CreateAsync(ers, cancellationToken).ConfigureAwait(false);
1028-
break;
10291025
default:
1030-
throw new InvalidOperationException($"Expected an Executable-like resource, but got {er.DcpResource.Kind} instead");
1026+
throw new InvalidOperationException($"Expected an Executable resource, but got {er.DcpResource.Kind} instead");
10311027
}
10321028

10331029
var failedToApplyArgs = false;
@@ -1603,10 +1599,6 @@ private void AddServicesProducedInfo(IResource modelResource, IAnnotationHolder
16031599

16041600
static bool HasMultipleReplicas(CustomResource resource)
16051601
{
1606-
if (resource is ExecutableReplicaSet ers && ers.Spec.Replicas > 1)
1607-
{
1608-
return true;
1609-
}
16101602
if (resource is Executable exe && exe.Metadata.Annotations.TryGetValue(CustomResource.ResourceReplicaCount, out var value) && int.TryParse(value, CultureInfo.InvariantCulture, out var replicas) && replicas > 1)
16111603
{
16121604
return true;
@@ -1673,10 +1665,6 @@ public async Task StopResourceAsync(string resourceName, CancellationToken cance
16731665
patch = CreatePatch(e, obj => obj.Spec.Stop = true);
16741666
await _kubernetesService.PatchAsync(e, patch, cancellationToken).ConfigureAwait(false);
16751667
break;
1676-
case ExecutableReplicaSet rs:
1677-
patch = CreatePatch(rs, obj => obj.Spec.Replicas = 0);
1678-
await _kubernetesService.PatchAsync(rs, patch, cancellationToken).ConfigureAwait(false);
1679-
break;
16801668
default:
16811669
throw new InvalidOperationException($"Unexpected resource type: {matchingResource.DcpResource.GetType().FullName}");
16821670
}
@@ -1710,12 +1698,6 @@ public async Task StartResourceAsync(string resourceName, CancellationToken canc
17101698
case Executable e:
17111699
await StartExecutableOrContainerAsync(e).ConfigureAwait(false);
17121700
break;
1713-
case ExecutableReplicaSet rs:
1714-
var replicas = matchingResource.ModelResource.GetReplicaCount();
1715-
var patch = CreatePatch(rs, obj => obj.Spec.Replicas = replicas);
1716-
1717-
await _kubernetesService.PatchAsync(rs, patch, cancellationToken).ConfigureAwait(false);
1718-
break;
17191701
default:
17201702
throw new InvalidOperationException($"Unexpected resource type: {matchingResource.DcpResource.GetType().FullName}");
17211703
}

0 commit comments

Comments
 (0)