kubernetes-sigs / cluster-api-provider-nested

Cluster API Provider for Nested Clusters
Apache License 2.0
298 stars 65 forks source link

πŸ› GetNodeIP returns first ready node #350

Closed Evan-Whitehouse closed 9 months ago

Evan-Whitehouse commented 1 year ago

What this PR does / why we need it:

The current implementation of kubectl-vc gets the first node in a cluster and stores its IP for the kubeconfig if the vc is set up with a nodeport service. This can cause issues if the chosen node's kubeproxy is down. Changing this to only select a ready node seems safer.

Before:

// GetNodeIP returns a node IP address
func GetNodeIP(cli client.Client) (string, error) {
    nodeLst := &corev1.NodeList{}
    if err := cli.List(context.TODO(), nodeLst); err != nil {
        return "", err
    }
    if len(nodeLst.Items) == 0 {
        return "", errors.New("there is no available nodes")
    }
        for _, addr := range nodeLst[0].Status.Addresses {
            if addr.Type == corev1.NodeInternalIP {
            return addr.Address, nil
            }
    }
    return "", errors.New("there is no 'NodeInternalIP' type address")
}

After:

// GetNodeIP returns a node IP address
func GetNodeIP(cli client.Client) (string, error) {
    nodeLst := &corev1.NodeList{}
    if err := cli.List(context.TODO(), nodeLst); err != nil {
        return "", err
    }
    if len(nodeLst.Items) == 0 {
        return "", errors.New("there is no available nodes")
    }

    for _, node := range nodeLst.Items {
        // Check if the node has the ready status condition
        for _, condition := range node.Status.Conditions {
            if condition.Type == corev1.NodeReady && condition.Status == corev1.ConditionTrue {
                //Look for internal IP
                for _, addr := range node.Status.Addresses {
                    if addr.Type == corev1.NodeInternalIP {
                        return addr.Address, nil
                    }
                }
            }
        }
    }

    return "", errors.New("there is no 'NodeInternalIP' type address with Ready status")
}
linux-foundation-easycla[bot] commented 1 year ago

CLA Signed

The committers listed above are authorized under a signed CLA.

k8s-ci-robot commented 1 year ago

Welcome @Evan-Whitehouse!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-nested πŸŽ‰. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-nested has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. :smiley:

k8s-ci-robot commented 1 year ago

Hi @Evan-Whitehouse. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
christopherhein commented 1 year ago

ok-to-test

christopherhein commented 1 year ago

/ok-to-test

k8s-ci-robot commented 9 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Evan-Whitehouse, Fei-Guo

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[virtualcluster/OWNERS](https://github.com/kubernetes-sigs/cluster-api-provider-nested/blob/main/virtualcluster/OWNERS)~~ [Fei-Guo] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment