kubeadm: add a Timeouts struct to v1beta4 #122529
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Skipping CI for Draft Pull Request. |
k8s-ci-robot
added
do-not-merge/work-in-progress
29 tasks
k8s-ci-robot
added
area/kubeadm
sig/cluster-lifecycle
|
/triage accepted |
k8s-ci-robot
added
triage/accepted
neolit123
force-pushed
the
1.30-v1beta4-timeouts
branch
2 times, most recently
from
3cd2fac
to
781ba9b
Compare
k8s-ci-robot
added
size/XL
neolit123
force-pushed
the
1.30-v1beta4-timeouts
branch
from
601d0ad
to
06eafbe
Compare
k8s-ci-robot
added
size/XXL
k8s-ci-robot
added
the
do-not-merge/hold
k8s-ci-robot
added
the
lgtm
|
LGTM label has been added. Git tree hash: 4045e3de72b42b3f2dda4bb97612287691857a85
|
SataQiu
approved these changes
Jan 11, 2024
Comment on lines
29
to
34
| ControlPlaneComponentHealthCheck: &metav1.Duration{Duration: 4 * time.Minute}, | ||
| KubeletHealthCheck: &metav1.Duration{Duration: 4 * time.Minute}, | ||
| KubernetesAPICall: &metav1.Duration{Duration: 1 * time.Minute}, | ||
| EtcdAPICall: &metav1.Duration{Duration: 2 * time.Minute}, | ||
| TLSBootstrap: &metav1.Duration{Duration: 5 * time.Minute}, | ||
| Discovery: &metav1.Duration{Duration: 5 * time.Minute}, |
There was a problem hiding this comment.
Whether it is better to use defined constants instead of literals?
for example:
...
Discovery: &metav1.Duration{Duration: constants.DefaultDiscoveryTimeout},
...There was a problem hiding this comment.
added as part of commit:
kubeadm: start using the Timeouts struct values
this is where all constants were refactored and defaults started to be used in the public v1beta4.
There was a problem hiding this comment.
to clarify: i had to add this defaulter util function because the converter for v1beta3 and the fuzzer needed it.
we might be able to drop it once v1beta3 is removed.
neolit123
force-pushed
the
1.30-v1beta4-timeouts
branch
from
f9f8c8e
to
d6b4b4d
Compare
k8s-ci-robot
removed
the
lgtm
k8s-ci-robot
added
the
lgtm
|
LGTM label has been added. Git tree hash: ef81e8c89b99dcd9a26e011d24cee5d07f882ce3
|
Replace the usage of the deprecated wait.Poll() and wait.PollImmediate() functions with wait.PollUntilContextTimeout(). Since we don't have piping of context around kubeadm, use context.Background() everywhere. Some wait.Poll() functions were converted to "immediate" as there is no point for them to not be. This is done for consistency. Replace the only instance of wait.JitterUntil with wait.PollUntilContextTimeout. JitterUntil is not deprecated but this is also done for consistency.
Propagate usage of the Timeout struct values. Apply sanitazation to timeout constants in contants.go.
Switch to PollUntilContextTimeout() everywhere to allow usage of the exposed timeouts in the kubeadm API. Exponential backoff options are more difficult to expose in this regard and a bit too detailed for the common user - i.e. have "steps", "factor" and so on.
neolit123
force-pushed
the
1.30-v1beta4-timeouts
branch
from
d6b4b4d
to
5f876b9
Compare
k8s-ci-robot
removed
the
lgtm
|
pushed minor diff to fix bug and resolve this actual flake |
k8s-ci-robot
added
the
lgtm
|
LGTM label has been added. Git tree hash: 4bc10264575887e8a4e1f2e343d2f5e617861b0b
|
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: neolit123, SataQiu 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 |
|
/hold cancel |
k8s-ci-robot
removed
the
do-not-merge/hold
pacoxu
reviewed
Jan 16, 2024
| @@ -332,15 +336,17 @@ func PatchNode(client clientset.Interface, nodeName string, patchFn func(*v1.Nod | |||
| func GetConfigMapWithRetry(client clientset.Interface, namespace, name string) (*v1.ConfigMap, error) { | |||
| var cm *v1.ConfigMap | |||
| var lastError error | |||
| err := wait.ExponentialBackoff(clientsetretry.DefaultBackoff, func() (bool, error) { | |||
There was a problem hiding this comment.
// DefaultBackoff is the recommended backoff for a conflict where a client
// may be attempting to make an unrelated modification to a resource under
// active management by one or more controllers.
var DefaultBackoff = wait.Backoff{
Steps: 4,
Duration: 10 * time.Millisecond,
Factor: 5.0,
Jitter: 0.1,
}
KubernetesAPICallRetryInterval, kubeadmapi.GetActiveTimeouts().KubernetesAPICall.Duration
= 500ms \ 1m
There was a problem hiding this comment.
Other places: KubernetesAPICall replaced kubeadmconstants.APICallWithWriteTimeout, they are correct.
This one we need another timeout setting or just keep it as.
pacoxu
added a commit
to pacoxu/kubernetes
that referenced
this pull request
Jan 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
/kind feature
What this PR does / why we need it:
add common Timeout structs in the kubeadm API that allows the user to configure various timeouts.
perform a number of side cleanups and sanitizations that further enable this functionality.
please see all commit messages, best to review one commit at a time.
Which issue(s) this PR fixes:
xref kubernetes/kubeadm#2463
xref kubernetes/kubeadm#2890
Special notes for your reviewer:
NOTE: didn't use existing commits and previous work from
@wangyysdeand@chendave.started the code work from scratch.
the plan is still roughly based on prior discussions in kubernetes/kubeadm#2463
of course.
Does this PR introduce a user-facing change?
Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.: