Merge pull request #1574 from buildkite/SUP-4693-cpu-credits-parameter

Configurable CpuCredits parameter for T-class instances

Author: petetomasik

templates/aws-stack.yml

@@ -81,6 +81,7 @@ Metadata:
         - ImageIdParameter
         - InstanceOperatingSystem
         - InstanceTypes
+        - CpuCredits
         - EnableInstanceStorage
         - MountTmpfsAtTmp
         - AgentsPerInstance
@@ -541,6 +542,14 @@ Parameters:
     AllowedPattern: "^[\\w-\\.]+(,[\\w-\\.]*){0,24}$"
     ConstraintDescription: "must contain 1-25 instance types separated by commas. No space before/after the comma."
 
+  CpuCredits:
+    Description: Credit option for CPU usage of burstable instances. Sets the CreditSpecification.CpuCredits property in the LaunchTemplate for T-class instance types (t2, t3, t3a, t4g).
+    Type: String
+    AllowedValues:
+      - standard
+      - unlimited
+    Default: "unlimited"
+
   MaxSize:
     Description: Maximum number of instances
     Type: Number
@@ -1163,6 +1172,13 @@ Conditions:
         - !Equals [ !Select [ 0, !Split [ ".", !Ref InstanceTypes ] ], "t4g" ]
         - !Equals [ !Select [ 0, !Split [ ".", !Ref InstanceTypes ] ], "x2gd" ]
 
+    UsingBurstableInstances:
+      !Or
+        - !Equals [ !Select [ 0, !Split [ ".", !Ref InstanceTypes ] ], "t2" ]
+        - !Equals [ !Select [ 0, !Split [ ".", !Ref InstanceTypes ] ], "t3" ]
+        - !Equals [ !Select [ 0, !Split [ ".", !Ref InstanceTypes ] ], "t3a" ]
+        - !Equals [ !Select [ 0, !Split [ ".", !Ref InstanceTypes ] ], "t4g" ]
+
     UseStackNameForInstanceName:
       !Equals [ !Ref InstanceName, "" ]
 
@@ -1699,6 +1715,10 @@ Resources:
                 Encrypted: !Ref RootVolumeEncrypted
                 Throughput: !If [ IsRootVolumeIsGp3, !Ref RootVolumeThroughput, !Ref "AWS::NoValue" ]
                 Iops: !If [ IsRootVolumeIsIo1OrIo2OrGp3, !Ref RootVolumeIops, !Ref "AWS::NoValue" ]
+          CreditSpecification: !If
+            - UsingBurstableInstances
+            - CpuCredits: !Ref CpuCredits
+            - !Ref "AWS::NoValue"
           TagSpecifications:
             - ResourceType: instance
               Tags: