Merge pull request #796 from PRX/revert-792-fix/large_redis_nodes

Revert "Use cache.m6g.large everywhere"
PRX · Dec 20, 2024 · 1c65444 · 1c65444
2 parents 9e01b79 + 2b165ae
commit 1c65444
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/spire/templates/root.yml b/spire/templates/root.yml
@@ -545,6 +545,7 @@ Resources:
         RootStackId: !Ref AWS::StackId
         EnvironmentType: !Ref EnvironmentType
         EnvironmentTypeAbbreviation: !Ref EnvironmentTypeAbbreviation
+        RegionMode: !FindInMap [RegionModeMap, !Ref "AWS::Region", !Ref EnvironmentType]
         NestedChangeSetScrubbingResourcesState: !Ref NestedChangeSetScrubbingResourcesState
         VpcPrivateSubnet1Id: !GetAtt SharedVpcStack.Outputs.PrivateSubnet1Id
         VpcPrivateSubnet2Id: !GetAtt SharedVpcStack.Outputs.PrivateSubnet2Id

diff --git a/spire/templates/shared-redis/cluster.yml b/spire/templates/shared-redis/cluster.yml
@@ -11,6 +11,7 @@ Parameters:
   RootStackId: { Type: String }
   EnvironmentType: { Type: String }
   EnvironmentTypeAbbreviation: { Type: String }
+  RegionMode: { Type: String }
   NestedChangeSetScrubbingResourcesState: { Type: String }
   VpcPrivateSubnet1Id: { Type: AWS::EC2::Subnet::Id }
   VpcPrivateSubnet2Id: { Type: AWS::EC2::Subnet::Id }
@@ -19,6 +20,7 @@ Parameters:
 
 Conditions:
   IsProduction: !Equals [!Ref EnvironmentType, Production]
+  IsPrimaryRegion: !Equals [!Ref RegionMode, Primary]
   EnableNestedChangeSetScrubbingResources: !Equals [!Ref NestedChangeSetScrubbingResourcesState, Enabled]
 
 Resources:
@@ -49,7 +51,7 @@ Resources:
       AtRestEncryptionEnabled: false
       AutomaticFailoverEnabled: true
       AutoMinorVersionUpgrade: false
-      CacheNodeType: !If [IsProduction, cache.m6g.large, cache.t4g.small]
+      CacheNodeType: !If [IsProduction, !If [IsPrimaryRegion, cache.m6g.large, cache.t4g.medium], cache.t4g.small]
       CacheParameterGroupName: default.redis7.cluster.on
       CacheSubnetGroupName: !Ref RedisSubnetGroup
       Engine: Redis