Skip to content
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

Jump to bottom

🐛 KCP: expect timeout from target cluster load-balancer #2409

Merged
merged 1 commit into from
Feb 24, 2020
Merged

🐛 KCP: expect timeout from target cluster load-balancer #2409

merged 1 commit into from
Feb 24, 2020

Conversation

maelk
Copy link
Contributor

@maelk maelk commented Feb 24, 2020

What this PR does / why we need it:
This PR adds a condition for Kubeadm Control Plane Controller to not fail if getting a timeout from the load-balancer in case it is self-hosted in the target cluster (and does not answer while the first node is not up

Which issue(s) this PR fixes :
Fixes #2408

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 24, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @maelk. 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. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 24, 2020
@maelk
Copy link
Contributor Author

maelk commented Feb 24, 2020

This might need to be configurable. We might want the controller to fail on timeout for external load-balancers.

@maelk
Copy link
Contributor Author

maelk commented Feb 24, 2020

/assign @vincepri
/cc @detiber

@detiber detiber added this to the v0.3.0-rc.2 milestone Feb 24, 2020
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 24, 2020
@detiber
Copy link
Member

detiber commented Feb 24, 2020

/ok-to-test
/approve

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Feb 24, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: detiber, maelk

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:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 24, 2020
@maelk
Copy link
Contributor Author

maelk commented Feb 24, 2020

/hold
I'll simplify into if err == nil

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 24, 2020
@maelk
Copy link
Contributor Author

maelk commented Feb 24, 2020

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 24, 2020
vincepri
vincepri reviewed Feb 24, 2020
View reviewed changes
controlplane/kubeadm/controllers/kubeadm_control_plane_controller.go Outdated

remoteClient, err := r.remoteClientGetter(ctx, r.Client, util.ObjectKey(cluster), r.scheme)
if err != nil && !apierrors.IsNotFound(errors.Cause(err)) {
if err != nil && !apierrors.IsNotFound(errors.Cause(err)) && !apierrors.IsTimeout(errors.Cause(err)) {
return errors.Wrap(err, "failed to create remote cluster client")
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this space for readability

controlplane/kubeadm/controllers/kubeadm_control_plane_controller.go Outdated

remoteClient, err := r.remoteClientGetter(ctx, r.Client, util.ObjectKey(cluster), r.scheme)
if err != nil && !apierrors.IsNotFound(errors.Cause(err)) {
if err != nil && !apierrors.IsNotFound(errors.Cause(err)) && !apierrors.IsTimeout(errors.Cause(err)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we have only if err != nil here, we can use a simple else condition for the range.

Inside the if err != nil block we can also do

if cause := errors.Cause(err); !apierrors.IsNotFound(cause) && !apierrors.IsTimeout(cause) {
...
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done, thank you

@maelk
KCP: expect timeout from target cluster load-balancer
c6f673d 
in case it is a self-hosted control-plane load-balancer
@k8s-ci-robot k8s-ci-robot removed the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 24, 2020
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 24, 2020
vincepri
vincepri approved these changes Feb 24, 2020
View reviewed changes
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 24, 2020
@k8s-ci-robot k8s-ci-robot merged commit f14c261 into kubernetes-sigs:master Feb 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@detiber detiber detiber left review comments

@vincepri vincepri vincepri approved these changes

@justinsb justinsb Awaiting requested review from justinsb

Assignees

@vincepri vincepri

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v0.3.0-rc.2
Development

Successfully merging this pull request may close these issues.

Kubeadm control plane controller logs filled with timeout error
4 participants
@maelk @k8s-ci-robot @detiber @vincepri