@@ -82,23 +82,25 @@ func (n Validation) Reconcile(ctx context.Context, nodeClass *v1.EC2NodeClass) (
8282 createFleetInput .DryRun = aws .Bool (true )
8383
8484 if _ , err := n .ec2api .CreateFleet (ctx , createFleetInput ); awserrors .IgnoreDryRunError (err ) != nil {
85- nodeClass .StatusConditions ().SetFalse (v1 .ConditionTypeValidationSucceeded , "CreateFleetAuthCheckFailed" , "Controller isn't authorized to call CreateFleet" )
8685 if awserrors .IgnoreUnauthorizedOperationError (err ) != nil {
86+ // Dry run should only ever return UnauthorizedOperation or DryRunOperation so if we receive any other error
87+ // it would be an unexpected state
8788 return reconcile.Result {}, fmt .Errorf ("unexpected error during CreateFleet validation: %w" , err )
8889 }
90+ nodeClass .StatusConditions ().SetFalse (v1 .ConditionTypeValidationSucceeded , "CreateFleetAuthCheckFailed" , "Controller isn't authorized to call CreateFleet" )
8991 return reconcile.Result {}, nil
9092 }
9193
9294 createLaunchTemplateInput := launchtemplate .GetCreateLaunchTemplateInput (mockOptions (* nodeClaim , nodeClass , tags ), corev1 .IPv4Protocol , "" )
9395 createLaunchTemplateInput .DryRun = aws .Bool (true )
9496
9597 if _ , err := n .ec2api .CreateLaunchTemplate (ctx , createLaunchTemplateInput ); awserrors .IgnoreDryRunError (err ) != nil {
96- nodeClass .StatusConditions ().SetFalse (v1 .ConditionTypeValidationSucceeded , "CreateLaunchTemplateAuthCheckFailed" , "Controller isn't authorized to call CreateLaunchTemplate" )
9798 if awserrors .IgnoreUnauthorizedOperationError (err ) != nil {
9899 // Dry run should only ever return UnauthorizedOperation or DryRunOperation so if we receive any other error
99100 // it would be an unexpected state
100101 return reconcile.Result {}, fmt .Errorf ("unexpected error during CreateLaunchTemplate validation: %w" , err )
101102 }
103+ nodeClass .StatusConditions ().SetFalse (v1 .ConditionTypeValidationSucceeded , "CreateLaunchTemplateAuthCheckFailed" , "Controller isn't authorized to call CreateLaunchTemplate" )
102104 return reconcile.Result {}, nil
103105 }
104106
@@ -108,19 +110,18 @@ func (n Validation) Reconcile(ctx context.Context, nodeClass *v1.EC2NodeClass) (
108110 }
109111
110112 var instanceType ec2types.InstanceType
111- if len (nodeClass .Status .AMIs ) > 0 {
112- requirements := scheduling .NewRequirements (lo .Map (nodeClass .Status .AMIs [0 ].Requirements , func (req corev1.NodeSelectorRequirement , _ int ) * scheduling.Requirement {
113- return scheduling .NewRequirement (req .Key , req .Operator , req .Values ... )
114- })... )
115-
116- if arch := requirements .Get ("kubernetes.io/arch" ); len (arch .Values ()) > 0 {
117- switch arch .Values ()[0 ] {
118- case "amd64" :
119- instanceType = ec2types .InstanceTypeM5Large
120- case "arm64" :
121- instanceType = ec2types .InstanceTypeM6gLarge
122- }
113+ requirements := scheduling .NewNodeSelectorRequirements (lo .Map (nodeClass .Status .AMIs [0 ].Requirements , func (req corev1.NodeSelectorRequirement , _ int ) corev1.NodeSelectorRequirement {
114+ return corev1.NodeSelectorRequirement {
115+ Key : req .Key ,
116+ Operator : req .Operator ,
117+ Values : req .Values ,
123118 }
119+ })... )
120+
121+ if requirements .Get (corev1 .LabelArchStable ).Has (karpv1 .ArchitectureAmd64 ) {
122+ instanceType = ec2types .InstanceTypeM5Large
123+ } else if requirements .Get (corev1 .LabelArchStable ).Has (karpv1 .ArchitectureArm64 ) {
124+ instanceType = ec2types .InstanceTypeM6gLarge
124125 }
125126
126127 runInstancesInput := & ec2.RunInstancesInput {
@@ -129,9 +130,11 @@ func (n Validation) Reconcile(ctx context.Context, nodeClass *v1.EC2NodeClass) (
129130 MinCount : aws .Int32 (1 ),
130131 InstanceType : instanceType ,
131132 MetadataOptions : & ec2types.InstanceMetadataOptionsRequest {
132- HttpTokens : ec2types .HttpTokensStateRequired ,
133- HttpEndpoint : ec2types .InstanceMetadataEndpointStateDisabled ,
134- HttpPutResponseHopLimit : aws .Int32 (2 ),
133+ HttpEndpoint : ec2types .InstanceMetadataEndpointState (lo .FromPtr (nodeClass .Spec .MetadataOptions .HTTPEndpoint )),
134+ HttpTokens : ec2types .HttpTokensState (lo .FromPtr (nodeClass .Spec .MetadataOptions .HTTPTokens )),
135+ //aws sdk v2 changed this type to *int32 instead of *int64
136+ //nolint: gosec
137+ HttpPutResponseHopLimit : aws .Int32 (int32 (lo .FromPtr (nodeClass .Spec .MetadataOptions .HTTPPutResponseHopLimit ))),
135138 },
136139 TagSpecifications : []ec2types.TagSpecification {
137140 {
@@ -151,12 +154,12 @@ func (n Validation) Reconcile(ctx context.Context, nodeClass *v1.EC2NodeClass) (
151154 }
152155
153156 if _ , err = n .ec2api .RunInstances (ctx , runInstancesInput ); awserrors .IgnoreDryRunError (err ) != nil {
154- nodeClass .StatusConditions ().SetFalse (v1 .ConditionTypeValidationSucceeded , "RunInstancesAuthCheckFailed" , "Controller isn't authorized to call RunInstances" )
155157 if awserrors .IgnoreUnauthorizedOperationError (err ) != nil {
156158 // Dry run should only ever return UnauthorizedOperation or DryRunOperation so if we receive any other error
157159 // it would be an unexpected state
158160 return reconcile.Result {}, fmt .Errorf ("unexpected error during RunInstances validation: %w" , err )
159161 }
162+ nodeClass .StatusConditions ().SetFalse (v1 .ConditionTypeValidationSucceeded , "RunInstancesAuthCheckFailed" , "Controller isn't authorized to call RunInstances" )
160163 return reconcile.Result {}, nil
161164 }
162165 nodeClass .StatusConditions ().SetTrue (v1 .ConditionTypeValidationSucceeded )
@@ -195,7 +198,7 @@ func mockOptions(nodeClaim karpv1.NodeClaim, nodeClass *v1.EC2NodeClass, tags ma
195198 HTTPEndpoint : nodeClass .Spec .MetadataOptions .HTTPEndpoint ,
196199 HTTPTokens : nodeClass .Spec .MetadataOptions .HTTPTokens ,
197200 HTTPProtocolIPv6 : nodeClass .Spec .MetadataOptions .HTTPProtocolIPv6 ,
198- HTTPPutResponseHopLimit : aws . Int64 ( 1 ) ,
201+ HTTPPutResponseHopLimit : nodeClass . Spec . MetadataOptions . HTTPPutResponseHopLimit ,
199202 },
200203 AMIID : nodeClaim .Status .ImageID ,
201204 BlockDeviceMappings : nodeClass .Spec .BlockDeviceMappings ,
0 commit comments