Skip to content

kubelet: Wait less for control-plane pods to restart #17510

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
Merged
merged 1 commit into from
Nov 25, 2025
Merged

kubelet: Wait less for control-plane pods to restart #17510

merged 1 commit into from
Nov 25, 2025
+61 −2

Conversation

@hakman
Copy link
Member

@hakman hakman commented Jul 22, 2025

/cc @justinsb @rifelpet @ameukam

/hold for feedback

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. area/api area/nodeup labels Jul 22, 2025
@hakman
Copy link
Member Author

hakman commented Jul 22, 2025

/test pull-kops-e2e-kubernetes-azure

@hakman hakman force-pushed the maxContainerRestartPeriod branch from eb805d2 to ecd8b8a Compare July 22, 2025 06:35
@hakman
Copy link
Member Author

hakman commented Jul 22, 2025

/test pull-kops-e2e-kubernetes-azure

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 22, 2025
@hakman hakman force-pushed the maxContainerRestartPeriod branch from ecd8b8a to e959dba Compare July 22, 2025 07:08
@hakman
Copy link
Member Author

hakman commented Jul 22, 2025

/test pull-kops-e2e-kubernetes-azure

@ameukam
Copy link
Member

ameukam commented Jul 22, 2025

TIL we can introduce alpha features in the kOps API.

@hakman hakman force-pushed the maxContainerRestartPeriod branch from e959dba to 0402ae9 Compare July 22, 2025 10:36
@hakman
Copy link
Member Author

hakman commented Jul 22, 2025

/test pull-kops-e2e-kubernetes-azure

@hakman
Copy link
Member Author

hakman commented Jul 22, 2025

/retest

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 29, 2025
justinsb
justinsb reviewed Aug 27, 2025
View reviewed changes
Copy link
Member

@justinsb justinsb left a comment

Choose a reason for hiding this comment

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

I like this idea. Unsure whether we should put it into the schema yet, but I'm definitely in favor of setting this on the control plane. (We could also look at an initContainer that waits for our dependencies)

nodeup/pkg/model/kubelet.go Outdated
if providerID != "" {
componentConfig.ProviderID = providerID
}
componentConfig.CrashLoopBackOff = kubelet.CrashLoopBackOffConfig{
Copy link
Member

@justinsb justinsb Aug 27, 2025

Choose a reason for hiding this comment

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

Nit: should we mirror the kubelet config structure here (i.e. kubelet.crashLoopBackOff.maxContainerRestartPeriod, instead of kubelet.crashLoopBackOffMaxContainerRestartPeriod)?

Copy link
Member Author

@hakman hakman Nov 25, 2025

Choose a reason for hiding this comment

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

I am not sure it's worth the effort to add an extra structure.

nodeup/pkg/model/kubelet.go Outdated
if c.FeatureGates == nil {
c.FeatureGates = make(map[string]string)
}
c.FeatureGates["KubeletCrashLoopBackOffMax"] = "true"
Copy link
Member

@justinsb justinsb Aug 27, 2025

Choose a reason for hiding this comment

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

Do we think KubeletCrashLoopBackOffMax is going to land? Because if we're not sure, we might not want to expose it in the kubelet config yet

Copy link
Member Author

@hakman hakman Nov 25, 2025

Choose a reason for hiding this comment

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

This became Beta in 1.35 so the PR is now updated.

@k8s-triage-robot
Copy link

k8s-triage-robot commented Nov 25, 2025

The Kubernetes project currently lacks enough contributors to adequately respond to all PRs.

This bot triages PRs according to the following rules:

  • After 90d of inactivity, lifecycle/stale is applied
  • After 30d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
  • After 30d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

  • Mark this PR as fresh with /remove-lifecycle stale
  • Close this PR with /close
  • Offer to help out with Issue Triage

Please send feedback to sig-contributor-experience at kubernetes/community.

/lifecycle stale

@k8s-ci-robot k8s-ci-robot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Nov 25, 2025
@hakman
Copy link
Member Author

hakman commented Nov 25, 2025

/remove-lifecycle stale

@k8s-ci-robot k8s-ci-robot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Nov 25, 2025
@hakman hakman force-pushed the maxContainerRestartPeriod branch from 0402ae9 to 79d156d Compare November 25, 2025 12:34
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 25, 2025
@hakman hakman force-pushed the maxContainerRestartPeriod branch from 79d156d to 7aafb55 Compare November 25, 2025 13:00
@hakman
Copy link
Member Author

hakman commented Nov 25, 2025

/test pull-kops-e2e-k8s-gce-ci

@hakman hakman force-pushed the maxContainerRestartPeriod branch from 7aafb55 to 4b751e8 Compare November 25, 2025 13:37
@hakman
Copy link
Member Author

hakman commented Nov 25, 2025

/test pull-kops-e2e-k8s-gce-ci

@hakman
Copy link
Member Author

hakman commented Nov 25, 2025

/unhold

@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 Nov 25, 2025
@ameukam
Copy link
Member

ameukam commented Nov 25, 2025

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 25, 2025
@hakman
Copy link
Member Author

hakman commented Nov 25, 2025

/test pull-kops-e2e-k8s-gce-ci
/test pull-kops-e2e-k8s-gce-cilium

@hakman
Copy link
Member Author

hakman commented Nov 25, 2025

/approve

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Nov 25, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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 Nov 25, 2025
@k8s-ci-robot k8s-ci-robot merged commit 7d24417 into kubernetes:master Nov 25, 2025
28 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.35 milestone Nov 25, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@justinsb justinsb justinsb left review comments

@ameukam ameukam Awaiting requested review from ameukam

@rifelpet rifelpet Awaiting requested review from rifelpet

Assignees

@ameukam ameukam

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/api area/nodeup 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

v1.35

Development

Successfully merging this pull request may close these issues.

5 participants

@hakman @ameukam @k8s-triage-robot @k8s-ci-robot @justinsb