From 3099305260b93b3329532c7bf013906ea17fb519 Mon Sep 17 00:00:00 2001 From: Sahil Badla Date: Fri, 11 Feb 2022 07:21:20 -0800 Subject: [PATCH] fix: Avoid launch template creation loop when switching from launch config and failing (#346) * bug fix for launchTemplate loop reconcile Signed-off-by: sbadla1 * bug fix for launchTemplate loop reconcile Signed-off-by: sbadla1 * bug fix for launchTemplate loop reconcile Signed-off-by: sbadla1 --- controllers/provisioners/eks/cloud.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/controllers/provisioners/eks/cloud.go b/controllers/provisioners/eks/cloud.go index 4ed8cfe0..4eb10b1b 100644 --- a/controllers/provisioners/eks/cloud.go +++ b/controllers/provisioners/eks/cloud.go @@ -226,7 +226,8 @@ func (ctx *EksInstanceGroupContext) CloudDiscovery() error { if spec.IsLaunchConfiguration() { state.ScalingConfiguration, err = scaling.NewLaunchConfiguration(instanceGroup.NamespacedName(), ctx.AwsWorker, &scaling.DiscoverConfigurationInput{ - ScalingGroup: targetScalingGroup, + ScalingGroup: targetScalingGroup, + TargetConfigName: state.ScalingConfiguration.Name(), }) if err != nil { return errors.Wrap(err, "failed to discover launch configurations") @@ -238,7 +239,8 @@ func (ctx *EksInstanceGroupContext) CloudDiscovery() error { if spec.IsLaunchTemplate() { state.ScalingConfiguration, err = scaling.NewLaunchTemplate(instanceGroup.NamespacedName(), ctx.AwsWorker, &scaling.DiscoverConfigurationInput{ - ScalingGroup: targetScalingGroup, + ScalingGroup: targetScalingGroup, + TargetConfigName: state.ScalingConfiguration.Name(), }) if err != nil { return errors.Wrap(err, "failed to discover launch templates")