From 4d18d9d8bc7ba2d9f1ef68f84f57906ace68ef1d Mon Sep 17 00:00:00 2001 From: Pavan Sokke Nagaraj Date: Thu, 23 Jan 2025 05:24:41 +0000 Subject: [PATCH 1/2] combine: use instanceID for providerID comparision --- exp/internal/controllers/machinepool_controller_noderef.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exp/internal/controllers/machinepool_controller_noderef.go b/exp/internal/controllers/machinepool_controller_noderef.go index 275027b0b6d4..44b4b5857bb0 100644 --- a/exp/internal/controllers/machinepool_controller_noderef.go +++ b/exp/internal/controllers/machinepool_controller_noderef.go @@ -184,7 +184,7 @@ func (r *MachinePoolReconciler) getNodeReferences(ctx context.Context, c client. continue } - nodeRefsMap[nodeProviderID.String()] = node + nodeRefsMap[nodeProviderID.ID()] = node } if nodeList.Continue == "" { @@ -199,7 +199,7 @@ func (r *MachinePoolReconciler) getNodeReferences(ctx context.Context, c client. log.V(2).Info("Failed to parse ProviderID, skipping", "err", err, "providerID", providerID) continue } - if node, ok := nodeRefsMap[pid.String()]; ok { + if node, ok := nodeRefsMap[pid.ID()]; ok { available++ if nodeIsReady(&node) { ready++ From 5c6ddc133cbf3457f244a7d786a36cc8181062ed Mon Sep 17 00:00:00 2001 From: Shubham Rajvanshi Date: Wed, 29 Jan 2025 16:58:04 -0600 Subject: [PATCH 2/2] refactor: use ID method for providerID in nodeRefsMap for delete nodes --- exp/internal/controllers/machinepool_controller_noderef.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exp/internal/controllers/machinepool_controller_noderef.go b/exp/internal/controllers/machinepool_controller_noderef.go index 44b4b5857bb0..b54e7ae03c55 100644 --- a/exp/internal/controllers/machinepool_controller_noderef.go +++ b/exp/internal/controllers/machinepool_controller_noderef.go @@ -148,7 +148,7 @@ func (r *MachinePoolReconciler) deleteRetiredNodes(ctx context.Context, c client continue } - nodeRefsMap[nodeProviderID.String()] = node + nodeRefsMap[nodeProviderID.ID()] = node } for _, providerID := range providerIDList { pid, err := noderefutil.NewProviderID(providerID) @@ -156,7 +156,7 @@ func (r *MachinePoolReconciler) deleteRetiredNodes(ctx context.Context, c client log.V(2).Info("Failed to parse ProviderID, skipping", "err", err, "providerID", providerID) continue } - delete(nodeRefsMap, pid.String()) + delete(nodeRefsMap, pid.ID()) } for _, node := range nodeRefsMap { if err := c.Delete(ctx, node); err != nil {