Move aarch64 capacity provider association

PRX · Jan 8, 2025 · 6dddc2a · 6dddc2a
1 parent a8346f6
commit 6dddc2a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/spire/templates/root.yml b/spire/templates/root.yml
@@ -405,6 +405,7 @@ Resources:
         VpcPublicSubnet1Id: !GetAtt SharedVpcStack.Outputs.PublicSubnet1Id
         VpcPublicSubnet2Id: !GetAtt SharedVpcStack.Outputs.PublicSubnet2Id
         VpcPublicSubnet3Id: !GetAtt SharedVpcStack.Outputs.PublicSubnet3Id
+        Aarch64AsgCapacityProviderName: !GetAtt SharedEcsAsgAarch64Stack.Outputs.CapacityProviderName
         EcsClusterName: !GetAtt SharedEcsClusterStack.Outputs.EcsClusterName
         SharedEcsAsgInstanceSecurityGroupId: !GetAtt SharedEcsAsgSecurityGroupStack.Outputs.InstanceSecurityGroupId
         LoadBalancerSecurityGroupId: !GetAtt SharedAlbStack.Outputs.LoadBalancerSecurityGroupId

diff --git a/spire/templates/shared-ecs/asg-aarch64.yml b/spire/templates/shared-ecs/asg-aarch64.yml
@@ -400,6 +400,9 @@ Resources:
         - !Ref VpcPublicSubnet2Id
         - !Ref VpcPublicSubnet3Id
 
+  # The capacity provider is associated with the ECS cluster in the x86-64
+  # template, for that's where the association resource was originally created
+  # and it's a pain to move.
   DefaultCapacityProvider:
     Type: AWS::ECS::CapacityProvider
     Properties:
@@ -424,21 +427,9 @@ Resources:
         - { Key: prx:cloudformation:root-stack-id, Value: !Ref RootStackId }
         - { Key: prx:ops:environment, Value: !Ref EnvironmentType }
         - { Key: prx:dev:application, Value: Common }
-  ClusterCapacityProviderAssociation:
-    Type: AWS::ECS::ClusterCapacityProviderAssociations
-    Properties:
-      Cluster: !Ref EcsClusterName
-      CapacityProviders:
-        - !Ref DefaultCapacityProvider
-        - !If [IsStaging, FARGATE, !Ref "AWS::NoValue"]
-        - !If [IsStaging, FARGATE_SPOT, !Ref "AWS::NoValue"]
-      DefaultCapacityProviderStrategy:
-        # With only one default capacity provider, the base and weight won't
-        # factor into scheduling; everything will be even within the ASG
-        - Base: 0
-          Weight: 1
-          CapacityProvider: !Ref DefaultCapacityProvider
 
 Outputs:
   AsgName:
     Value: !Ref Asg
+  CapacityProviderName:
+    Value: !Ref DefaultCapacityProvider
diff --git a/spire/templates/shared-ecs/asg-x86-64.yml b/spire/templates/shared-ecs/asg-x86-64.yml
@@ -34,6 +34,7 @@ Parameters:
   VpcPublicSubnet1Id: { Type: AWS::EC2::Subnet::Id }
   VpcPublicSubnet2Id: { Type: AWS::EC2::Subnet::Id }
   VpcPublicSubnet3Id: { Type: AWS::EC2::Subnet::Id }
+  Aarch64AsgCapacityProviderName: { Type: String }
   EcsClusterName: { Type: String }
   SharedEcsAsgInstanceSecurityGroupId: { Type: AWS::EC2::SecurityGroup::Id }
   LoadBalancerSecurityGroupId: { Type: AWS::EC2::SecurityGroup::Id }
@@ -433,11 +434,15 @@ Resources:
         - { Key: prx:ops:environment, Value: !Ref EnvironmentType }
         - { Key: prx:dev:application, Value: Common }
   ClusterCapacityProviderAssociation:
+    # This is handling associations for capacity providers, even ones not
+    # created in this template. It exists here because we used to only have one
+    # ASG template, and moving it is sort of a pain.
     Type: AWS::ECS::ClusterCapacityProviderAssociations
     Properties:
       Cluster: !Ref EcsClusterName
       CapacityProviders:
         - !Ref DefaultCapacityProvider
+        - !Ref Aarch64AsgCapacityProviderName
         - !If [IsStaging, FARGATE, !Ref "AWS::NoValue"]
         - !If [IsStaging, FARGATE_SPOT, !Ref "AWS::NoValue"]
       DefaultCapacityProviderStrategy: