Skip to content

Commit f52a118

Browse files
committed
Fix providerIDList in managed node pools
1 parent 6baacaa commit f52a118

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

pkg/cloud/services/eks/nodegroup.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import (
3636
"sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/services/wait"
3737
"sigs.k8s.io/cluster-api-provider-aws/pkg/record"
3838
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
39-
"sigs.k8s.io/cluster-api/controllers/noderefutil"
4039
)
4140

4241
func (s *NodegroupService) describeNodegroup() (*eks.Nodegroup, error) {
@@ -591,12 +590,7 @@ func (s *NodegroupService) setStatus(ng *eks.Nodegroup) error {
591590
for _, group := range groups.AutoScalingGroups {
592591
replicas += int32(len(group.Instances))
593592
for _, instance := range group.Instances {
594-
id, err := noderefutil.NewProviderID(fmt.Sprintf("aws://%s/%s", *instance.AvailabilityZone, *instance.InstanceId))
595-
if err != nil {
596-
s.Error(err, "couldn't create provider ID for instance", "id", *instance.InstanceId)
597-
continue
598-
}
599-
providerIDList = append(providerIDList, id.String())
593+
providerIDList = append(providerIDList, fmt.Sprintf("aws:///%s/%s", *instance.AvailabilityZone, *instance.InstanceId))
600594
}
601595
}
602596
managedPool.Spec.ProviderIDList = providerIDList

0 commit comments

Comments
 (0)