kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not try to deregister karpenter nodes from ELBs

This commit is contained in:
Ole Markus With 2021-12-15 09:18:43 +01:00
parent 5e944f1a15
commit fab77b45ee
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
upup/pkg/fi/cloudup/awsup/aws_cloud.go
View File

@ -546,9 +546,11 @@ func deleteInstance(c AWSCloud, i *cloudinstances.CloudInstance) error {
return fmt.Errorf("id was not set on CloudInstance: %v", i) return fmt.Errorf("id was not set on CloudInstance: %v", i)
} }
err := deregisterInstanceFromClassicLoadBalancer(c, i) if i.CloudInstanceGroup.InstanceGroup.Spec.Manager != kops.InstanceManagerKarpenter {
if err != nil { err := deregisterInstanceFromClassicLoadBalancer(c, i)
return fmt.Errorf("failed to deregister instance from loadBalancer before terminating: %v", err) if err != nil {
return fmt.Errorf("failed to deregister instance from loadBalancer before terminating: %v", err)
}
} }
request := &ec2.TerminateInstancesInput{ request := &ec2.TerminateInstancesInput{
@ -576,7 +578,6 @@ func deregisterInstanceFromClassicLoadBalancer(c AWSCloud, i *cloudinstances.Clo
asgDetails, err := c.Autoscaling().DescribeAutoScalingGroups(&autoscaling.DescribeAutoScalingGroupsInput{ asgDetails, err := c.Autoscaling().DescribeAutoScalingGroups(&autoscaling.DescribeAutoScalingGroupsInput{
AutoScalingGroupNames: []*string{asg.AutoScalingGroupName}, AutoScalingGroupNames: []*string{asg.AutoScalingGroupName},
}) })
if err != nil { if err != nil {
return fmt.Errorf("error describing autoScalingGroups: %v", err) return fmt.Errorf("error describing autoScalingGroups: %v", err)
} }
@ -599,7 +600,6 @@ func deregisterInstanceFromClassicLoadBalancer(c AWSCloud, i *cloudinstances.Clo
InstanceId: aws.String(i.ID), InstanceId: aws.String(i.ID),
}}, }},
}) })
if err != nil { if err != nil {
return fmt.Errorf("error describing instance health: %v", err) return fmt.Errorf("error describing instance health: %v", err)
} }