Merge pull request #461 from kubernetes-sigs/podbugfix

Fixing a bug where we deregister pod targets on updates

Author: bigkraig

pkg/alb/tg/targetgroup.go

@@ -242,6 +242,7 @@ func (t *TargetGroup) create(rOpts *ReconcileOptions) error {
 		rOpts.Eventf(api.EventTypeWarning, "ERROR", "Error registering targets to target group %s: %s", t.ID, err.Error())
 		return fmt.Errorf("Failed TargetGroup creation. Unable to register targets:  %s.", err.Error())
 	}
+	t.targets.current = t.targets.desired
 
 	if len(t.attributes.desired) > 0 {
 		// Add TargetGroup attributes
@@ -432,8 +433,6 @@ func (t *TargetGroup) registerTargets(additions albelbv2.TargetDescriptions, rOp
 		return err
 	}
 
-	t.targets.current = t.targets.desired
-
 	// when managing security groups, ensure sg is associated with instance
 	if rOpts.ManagedSGInstance != nil {
 		err := albec2.EC2svc.AssociateSGToInstanceIfNeeded(additions, rOpts.ManagedSGInstance)
@@ -456,8 +455,6 @@ func (t *TargetGroup) deregisterTargets(removals albelbv2.TargetDescriptions, rO
 		return err
 	}
 
-	t.targets.current = t.targets.desired
-
 	// when managing security groups, ensure sg is disassociated with instance
 	if rOpts.ManagedSGInstance != nil {
 		err := albec2.EC2svc.DisassociateSGFromInstanceIfNeeded(removals, rOpts.ManagedSGInstance)

pkg/alb/tg/targetgroups.go

@@ -177,7 +177,7 @@ func NewDesiredTargetGroups(o *NewDesiredTargetGroupsOptions) (TargetGroups, err
 				output[i].copyDesiredState(targetGroup)
 
 				// If there is a current TG ARN we can use it to purge the desired targets of unready instances
-				if output[i].CurrentARN() != nil {
+				if output[i].CurrentARN() != nil && *tgAnnotations.TargetType == "instance" {
 					desired, err := albelbv2.ELBV2svc.DescribeTargetGroupTargetsForArn(output[i].CurrentARN(), output[i].targets.desired)
 					if err != nil {
 						return nil, err