Skip to content

Commit 65da70d

Browse files
committed
fix(nodegroup): check for LT version first
1 parent 91941d9 commit 65da70d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

pkg/cloud/services/eks/nodegroup.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,12 @@ func (s *NodegroupService) reconcileNodegroupVersion(ng *eks.Nodegroup) error {
348348
var updateMsg string
349349
// Either update k8s version or AMI version
350350
switch {
351+
case statusLaunchTemplateVersion != nil && *statusLaunchTemplateVersion != *ngLaunchTemplateVersion:
352+
input.LaunchTemplate = &eks.LaunchTemplateSpecification{
353+
Id: s.scope.ManagedMachinePool.Status.LaunchTemplateID,
354+
Version: statusLaunchTemplateVersion,
355+
}
356+
updateMsg = fmt.Sprintf("to launch template version %s", *statusLaunchTemplateVersion)
351357
case specVersion != nil && ngVersion.LessThan(specVersion):
352358
// NOTE: you can only upgrade increments of minor versions. If you want to upgrade 1.14 to 1.16 we
353359
// need to go 1.14-> 1.15 and then 1.15 -> 1.16.
@@ -356,12 +362,6 @@ func (s *NodegroupService) reconcileNodegroupVersion(ng *eks.Nodegroup) error {
356362
case specAMI != nil && *specAMI != ngAMI:
357363
input.ReleaseVersion = specAMI
358364
updateMsg = fmt.Sprintf("to AMI version %s", *input.ReleaseVersion)
359-
case statusLaunchTemplateVersion != nil && *statusLaunchTemplateVersion != *ngLaunchTemplateVersion:
360-
input.LaunchTemplate = &eks.LaunchTemplateSpecification{
361-
Id: s.scope.ManagedMachinePool.Status.LaunchTemplateID,
362-
Version: statusLaunchTemplateVersion,
363-
}
364-
updateMsg = fmt.Sprintf("to launch template version %s", *statusLaunchTemplateVersion)
365365
}
366366

367367
if err := wait.WaitForWithRetryable(wait.NewBackoff(), func() (bool, error) {

0 commit comments

Comments
 (0)