Add instance info to detached nodes

kubernetes · Sep 2, 2020 · 8cce475 · 8cce475
1 parent cf0466b
commit 8cce475
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/upup/pkg/fi/cloudup/awsup/aws_cloud.go b/upup/pkg/fi/cloudup/awsup/aws_cloud.go
@@ -788,17 +788,7 @@ func awsBuildCloudInstanceGroup(c AWSCloud, cluster *kops.Cluster, ig *kops.Inst
 			return nil, fmt.Errorf("error creating cloud instance group member: %v", err)
 		}
 
-		cm.MachineType = aws.StringValue(i.InstanceType)
-		instance := instances[id]
-		for _, tag := range instance.Tags {
-			key := aws.StringValue(tag.Key)
-			if !strings.HasPrefix(key, TagNameRolePrefix) {
-				continue
-			}
-			role := strings.TrimPrefix(key, TagNameRolePrefix)
-			cm.Roles = append(cm.Roles, role)
-			cm.PrivateIP = aws.StringValue(instance.PrivateIpAddress)
-		}
+		addCloudInstanceData(cm, instances[id])
 
 	}
 
@@ -815,17 +805,31 @@ func awsBuildCloudInstanceGroup(c AWSCloud, cluster *kops.Cluster, ig *kops.Inst
 	}
 	for _, id := range detached {
 		if id != nil && *id != "" && !instanceSeen[*id] {
-			_, err := cg.NewCloudInstance(*id, cloudinstances.CloudInstanceStatusDetached, nodeMap)
+			cm, err := cg.NewCloudInstance(*id, cloudinstances.CloudInstanceStatusDetached, nodeMap)
 			if err != nil {
 				return nil, fmt.Errorf("error creating cloud instance group member: %v", err)
 			}
 			instanceSeen[*id] = true
+			addCloudInstanceData(cm, instances[aws.StringValue(id)])
 		}
 	}
 
 	return cg, nil
 }
 
+func addCloudInstanceData(cm *cloudinstances.CloudInstance, instance *ec2.Instance) {
+	cm.MachineType = aws.StringValue(instance.InstanceType)
+	for _, tag := range instance.Tags {
+		key := aws.StringValue(tag.Key)
+		if !strings.HasPrefix(key, TagNameRolePrefix) {
+			continue
+		}
+		role := strings.TrimPrefix(key, TagNameRolePrefix)
+		cm.Roles = append(cm.Roles, role)
+		cm.PrivateIP = aws.StringValue(instance.PrivateIpAddress)
+	}
+}
+
 func findInstances(c AWSCloud, ig *kops.InstanceGroup) (map[string]*ec2.Instance, error) {
 	req := &ec2.DescribeInstancesInput{
 		Filters: []*ec2.Filter{