Skip to content

Fetch nodePool by clusterName #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Feb 8, 2021
Merged

Fetch nodePool by clusterName #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ func (r *HostedClusterReconciler) listNodePools(clusterNamespace, clusterName st
// TODO: do a label association or something
filtered := []hyperv1.NodePool{}
for i, nodePool := range nodePoolList.Items {
if nodePool.Namespace == clusterNamespace && nodePool.Name == clusterName {
if nodePool.Namespace == clusterNamespace && nodePool.Spec.ClusterName == clusterName {
filtered = append(filtered, nodePoolList.Items[i])
}
}
Expand All @@ -330,7 +330,7 @@ func (r *HostedClusterReconciler) delete(ctx context.Context, req ctrl.Request)

for key := range nodePools {
if err := r.Delete(ctx, &nodePools[key]); err != nil && !apierrors.IsNotFound(err) {
return fmt.Errorf("failed to delete defaultNodePool: %w", err)
return fmt.Errorf("failed to delete nodePool %q for cluster %q: %w", nodePools[key].GetName(), req.Name, err)
}
}

Expand Down