Adding back in conditional statements and Capacity Provider logic for…

… environments.
APTrust · May 13, 2024 · c42fc23 · c42fc23
1 parent b3901d9
commit c42fc23
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 10 deletions.
diff --git a/cfn/cfn-registry-cluster.tmpl b/cfn/cfn-registry-cluster.tmpl
@@ -54,6 +54,10 @@ Parameters:
     AllowedValues: [1, 7, 14, 30, 90] 
     Default: 30
 
+Conditions:
+  IsStaging: !Or [!Equals [!Ref DNS, 'staging'], !Equals [!Ref DNS, 'demo']]
+  IsPrimary: !Equals [!Ref DNS, 'prod']
+
 
 Resources:
 
@@ -65,11 +69,18 @@ Resources:
         - FARGATE  
         - FARGATE_SPOT
       DefaultCapacityProviderStrategy:
-        - CapacityProvider: FARGATE 
-          Weight: 1
-          Base: 1
-        - CapacityProvider: FARGATE_SPOT
-          Weight: 2
+        Fn::If:
+          - IsPrimary
+          - 
+            - CapacityProvider: FARGATE
+              Weight: 1
+              Base: 1
+            - CapacityProvider: FARGATE_SPOT
+              Weight: 2 
+          - 
+            - CapacityProvider: FARGATE_SPOT
+              Base: 1
+              Weight: 1
       ClusterSettings: 
         - Name: containerInsights
           Value: enabled 
@@ -82,6 +93,8 @@ Resources:
       - Key: Name
         Value: !Sub 'ecs-registry-${DNS}'
       - Key: Environment
+      - Key: MicroServ
+        Value: registry
         Value: !Ref DNS
       - Key: Service 
         Value: registry

diff --git a/cfn/cfn-registry-cluster.yml b/cfn/cfn-registry-cluster.yml
@@ -54,6 +54,9 @@ Parameters:
     AllowedValues: [1, 7, 14, 30, 90] 
     Default: 30
 
+Conditions:
+  IsStaging: !Or [!Equals [!Ref DNS, 'staging'], !Equals [!Ref DNS, 'demo']]
+  IsPrimary: !Equals [!Ref DNS, 'prod']
 
 Resources:
 
@@ -65,11 +68,18 @@ Resources:
         - FARGATE  
         - FARGATE_SPOT
       DefaultCapacityProviderStrategy:
-        - CapacityProvider: FARGATE 
-          Weight: 1
-          Base: 1
-        - CapacityProvider: FARGATE_SPOT
-          Weight: 2
+        Fn::If:
+          - IsPrimary
+          - 
+            - CapacityProvider: FARGATE
+              Weight: 1
+              Base: 1
+            - CapacityProvider: FARGATE_SPOT
+              Weight: 2 
+          - 
+            - CapacityProvider: FARGATE_SPOT
+              Base: 1
+              Weight: 1
       ClusterSettings: 
         - Name: containerInsights
           Value: enabled 
@@ -140,6 +150,8 @@ Resources:
       Tags:  
       - Key: Service
         Value: registry
+      - Key: MicroServ
+        Value: registry
       - Key: Environment
         Value: !Ref "DNS"
       TaskDefinition: !Ref RegistryTaskDefinition