Remove TODOs based on upstream CAPA PR 2864 merge

Removed two TODOs waiting on an upstream CAPA PR to be merged and included: kubernetes-sigs/cluster-api-provider-aws#2864.

Signed-off-by: Bryan Cox <[email protected]>

hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go

@@ -186,15 +186,6 @@ func (r *HostedClusterReconciler) SetupWithManager(mgr ctrl.Manager, createOrUpd
 		builder.Watches(&source.Kind{Type: managedResource}, handler.EnqueueRequestsFromMapFunc(enqueueParentHostedCluster))
 	}
 
-	// TODO (alberto): drop this once this is fixed upstream https://github.com/kubernetes-sigs/cluster-api-provider-aws/pull/2864.
-	builder.Watches(&source.Kind{Type: &hyperv1.NodePool{}}, handler.EnqueueRequestsFromMapFunc(func(obj client.Object) []reconcile.Request {
-		nodePool, ok := obj.(*hyperv1.NodePool)
-		if !ok {
-			return []reconcile.Request{}
-		}
-		return []reconcile.Request{{NamespacedName: types.NamespacedName{Namespace: nodePool.GetNamespace(), Name: nodePool.Spec.ClusterName}}}
-	}))
-
 	// Set based on SCC capability
 	// When SCC is available (OpenShift), the container's security context and UID range is automatically set
 	// When SCC is not available (Kubernetes), we want to explicitly set a default (non-root) security context
@@ -3927,24 +3918,6 @@ func (r *HostedClusterReconciler) reconcileAWSSubnets(ctx context.Context, creat
 	}
 	// Sort for stable update detection (is this needed?)
 	sort.Strings(subnetIDs)
-
-	// Reconcile subnet IDs in AWSCluster
-	// TODO (alberto): drop this once this is fixed upstream https://github.com/kubernetes-sigs/cluster-api-provider-aws/pull/2864.
-	awsInfraCR, ok := infraCR.(*capiaws.AWSCluster)
-	if !ok {
-		return nil
-	}
-	subnets := capiaws.Subnets{}
-	for _, subnetID := range subnetIDs {
-		subnets = append(subnets, capiaws.SubnetSpec{ID: subnetID})
-	}
-	_, err = createOrUpdate(ctx, r.Client, awsInfraCR, func() error {
-		awsInfraCR.Spec.NetworkSpec.Subnets = subnets
-		return nil
-	})
-	if err != nil {
-		return fmt.Errorf("failed to reconcile networks for CAPA Infra CR: %w", err)
-	}
 	return nil
 }