Skip to content

Commit 0e14e94

Browse files
jonathan-innisedibble21
authored andcommitted
chore: Add CreateError when launch template isn't found (aws#7711)
1 parent 3a1effd commit 0e14e94

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ require (
4343
k8s.io/klog/v2 v2.130.1
4444
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
4545
sigs.k8s.io/controller-runtime v0.20.1
46-
sigs.k8s.io/karpenter v1.2.1-0.20250207011955-403034a0cbd9
46+
sigs.k8s.io/karpenter v1.2.1-0.20250208015555-8e8b99d6bfa2
4747
sigs.k8s.io/yaml v1.4.0
4848
)
4949

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,8 @@ sigs.k8s.io/controller-runtime v0.20.1 h1:JbGMAG/X94NeM3xvjenVUaBjy6Ui4Ogd/J5Ztj
336336
sigs.k8s.io/controller-runtime v0.20.1/go.mod h1:BrP3w158MwvB3ZbNpaAcIKkHQ7YGpYnzpoSTZ8E14WU=
337337
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
338338
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
339-
sigs.k8s.io/karpenter v1.2.1-0.20250207011955-403034a0cbd9 h1:/phqkLkjx+iIPoUpFzZQBzGAEYlDmFvgXrFjeH/Cw1M=
340-
sigs.k8s.io/karpenter v1.2.1-0.20250207011955-403034a0cbd9/go.mod h1:S+qNY3XwugJTu+UvgAdeNUxWuwQP/gS0uefdrV5wFLE=
339+
sigs.k8s.io/karpenter v1.2.1-0.20250208015555-8e8b99d6bfa2 h1:E8ZbRdDrRfAaNgLgOl3qkBGMyKOoDTb7grYEwV6+FBQ=
340+
sigs.k8s.io/karpenter v1.2.1-0.20250208015555-8e8b99d6bfa2/go.mod h1:S+qNY3XwugJTu+UvgAdeNUxWuwQP/gS0uefdrV5wFLE=
341341
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
342342
sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
343343
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=

pkg/providers/instance/instance.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -249,13 +249,13 @@ func (p *DefaultProvider) launchInstance(ctx context.Context, nodeClass *v1.EC2N
249249
createFleetOutput, err := p.ec2Batcher.CreateFleet(ctx, createFleetInput)
250250
p.subnetProvider.UpdateInflightIPs(createFleetInput, createFleetOutput, instanceTypes, lo.Values(zonalSubnets), capacityType)
251251
if err != nil {
252+
reason, message := awserrors.ToReasonMessage(err)
252253
if awserrors.IsLaunchTemplateNotFound(err) {
253254
for _, lt := range launchTemplateConfigs {
254255
p.launchTemplateProvider.InvalidateCache(ctx, aws.ToString(lt.LaunchTemplateSpecification.LaunchTemplateName), aws.ToString(lt.LaunchTemplateSpecification.LaunchTemplateId))
255256
}
256-
return ec2types.CreateFleetInstance{}, fmt.Errorf("creating fleet %w", err)
257+
return ec2types.CreateFleetInstance{}, cloudprovider.NewCreateError(fmt.Errorf("launch templates not found when creating fleet request, %w", err), reason, fmt.Sprintf("Launch templates not found when creating fleet request: %s", message))
257258
}
258-
reason, message := awserrors.ToReasonMessage(err)
259259
var reqErr *awshttp.ResponseError
260260
if errors.As(err, &reqErr) {
261261
return ec2types.CreateFleetInstance{}, cloudprovider.NewCreateError(fmt.Errorf("creating fleet request, %w (%v)", err, reqErr.ServiceRequestID()), reason, fmt.Sprintf("Error creating fleet request: %s", message))

0 commit comments

Comments
 (0)