ContainerRestartRules feature gate should work with probes #133243

yuanwang04 · 2025-07-27T23:28:55Z

What type of PR is this?

/kind bug

What this PR does / why we need it:

Fixes the feature gate ContainerRestartRules not working with readiness probes.

Which issue(s) this PR is related to:

Fixes #133216
KEP: kubernetes/enhancements#5307

Special notes for your reviewer:

Added the computePodAction unit tests under the feature gate ContainerRestartRules to ensure all existing behavior stays the same when the feature is enabled.

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

- [KEP]: https://github.com/kubernetes/enhancements/issues/5307

k8s-ci-robot · 2025-07-27T23:29:05Z

Hi @yuanwang04. Thanks for your PR.

I'm waiting for a kubernetes 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-sigs/prow repository.

yuanwang04 · 2025-07-27T23:30:14Z

/cc @SergeyKanzhelev

SergeyKanzhelev · 2025-07-28T01:16:50Z

/ok-to-test

SergeyKanzhelev · 2025-07-28T01:17:28Z

/test pull-kubernetes-e2e-kind-alpha-beta-features

HirazawaUi · 2025-07-28T12:20:49Z

This feature-related e2e test was skipped in the pull-kubernetes-e2e-kind-alpha-beta-features test job and was not executed.

You don't need to add the feature.ContainerRestartRules label to the test case, as it appears to be causing the test case to be skipped.

aojea · 2025-07-28T13:27:56Z

You don't need to add the feature.ContainerRestartRules label to the test case, as it appears to be causing the test case to be skipped.

See https://groups.google.com/a/kubernetes.io/g/dev/c/uVga86nJDuI/m/gVujvOCnDwAJ for instructions
/cc @BenTheElder

aojea · 2025-07-28T13:29:41Z

@yuanwang04 , what @HirazawaUi says

diff --git a/test/e2e/node/pods.go b/test/e2e/node/pods.go
index 94171ea245f..dd8528bcf74 100644
--- a/test/e2e/node/pods.go
+++ b/test/e2e/node/pods.go
@@ -718,7 +718,7 @@ var _ = SIGDescribe("Pods Extended (pod generation)", feature.PodObservedGenerat
        })
 })
 
-var _ = SIGDescribe("Pod Extended (container restart policy)", feature.ContainerRestartRules, framework.WithFeatureGate(features.ContainerRestartRules), func() {
+var _ = SIGDescribe("Pod Extended (container restart policy)", framework.WithFeatureGate(features.ContainerRestartRules), func() {
        f := framework.NewDefaultFramework("pods")
        f.NamespacePodSecurityLevel = admissionapi.LevelBaseline

pkg/kubelet/kuberuntime/kuberuntime_container.go

SergeyKanzhelev · 2025-07-28T17:12:39Z

/test pull-kubernetes-e2e-kind-alpha-beta-features

SergeyKanzhelev · 2025-07-28T17:13:29Z

changes are ok, and I think it is safe to move forward instead of rolling back. Everything is under the feature gate still.

let's wait for tests execution

…and probes

SergeyKanzhelev · 2025-07-28T17:25:12Z

/test pull-kubernetes-e2e-kind-alpha-beta-features

BenTheElder · 2025-07-28T17:34:08Z

test/e2e/node/pods.go

@@ -718,7 +718,7 @@ var _ = SIGDescribe("Pods Extended (pod generation)", feature.PodObservedGenerat
 	})
 })

-var _ = SIGDescribe("Pod Extended (container restart policy)", feature.ContainerRestartRules, framework.WithFeatureGate(features.ContainerRestartRules), func() {
+var _ = SIGDescribe("Pod Extended (container restart policy)", framework.WithFeatureGate(features.ContainerRestartRules), func() {


BenTheElder · 2025-07-28T17:54:14Z

https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/133243/pull-kubernetes-e2e-kind-alpha-beta-features/1949883864046374912

Five passing test cases match Pod Extended (container restart policy)

BenTheElder · 2025-07-28T17:54:44Z

/test pull-kubernetes-e2e-kind-alpha-features
/test pull-kubernetes-e2e-kind-beta-features

k8s-ci-robot · 2025-07-28T18:17:55Z

@yuanwang04: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-kubernetes-e2e-kind-alpha-features	`fd206a0`	link	false	`/test pull-kubernetes-e2e-kind-alpha-features`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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-sigs/prow repository. I understand the commands that are listed here.

BenTheElder · 2025-07-28T18:25:41Z

Kubernetes e2e suite: [It] [sig-network] Proxy version v1 should proxy through a service and a pod [Conformance]

#133257

/retest

BenTheElder · 2025-07-28T18:37:05Z

[these PASSED, testing again for more signal]
/test pull-kubernetes-e2e-kind-alpha-beta-features
/test pull-kubernetes-e2e-kind-beta-features

BenTheElder · 2025-07-28T18:38:01Z

/priority critical-urgent
/triage accepted
/approve
for test/

SergeyKanzhelev

/approve
/lgtm
/milestone v1.34

k8s-ci-robot · 2025-07-28T18:42:03Z

LGTM label has been added.

Git tree hash: 06d406af05114f50bdd78edb26219edfde035b89

k8s-ci-robot · 2025-07-28T18:42:08Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder, SergeyKanzhelev, yuanwang04

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:

~~pkg/kubelet/OWNERS~~ [SergeyKanzhelev]
~~test/e2e/node/OWNERS~~ [BenTheElder,SergeyKanzhelev]

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

SergeyKanzhelev · 2025-07-28T18:43:55Z

[these PASSED, testing again for more signal] /test pull-kubernetes-e2e-kind-alpha-beta-features /test pull-kubernetes-e2e-kind-beta-features

oops, I missed this. Sorry. Let's watch for tests in master

BenTheElder · 2025-07-28T18:45:59Z

SGTM, I expect them to pass again, and these were failing not flaking so we probably don't need another run anyhow.

But they're quick, cheap, and currently all non-blocking so ...

ContainerRestartRules feature gate should work with probes

9c8dacb

k8s-ci-robot requested review from sjenning and yujuhong July 27, 2025 23:29

k8s-ci-robot added area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jul 27, 2025

github-project-automation bot added this to SIG Node: code and documentation PRs Jul 27, 2025

github-project-automation bot moved this to Triage in SIG Node: code and documentation PRs Jul 27, 2025

k8s-ci-robot requested a review from SergeyKanzhelev July 27, 2025 23:30

yuanwang04 mentioned this pull request Jul 27, 2025

[Failing test] [sig-node] Probing container should override timeoutGracePeriodSeconds when LivenessProbe field is set, [sig-node] Probing container should override timeoutGracePeriodSeconds when StartupProbe field is set #133216

Closed

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 Jul 28, 2025

aojea mentioned this pull request Jul 28, 2025

Revert restart rules #133240

Closed

k8s-ci-robot requested a review from BenTheElder July 28, 2025 13:27

Remove the feature from e2e test

4b479da

SergeyKanzhelev reviewed Jul 28, 2025

View reviewed changes

pkg/kubelet/kuberuntime/kuberuntime_container.go Show resolved Hide resolved

Add comments for restart rules not used for unknown container status …

fd206a0

…and probes

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 28, 2025

BenTheElder reviewed Jul 28, 2025

View reviewed changes

SergeyKanzhelev approved these changes Jul 28, 2025

View reviewed changes

k8s-ci-robot added this to the v1.34 milestone Jul 28, 2025

k8s-ci-robot assigned SergeyKanzhelev Jul 28, 2025

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 28, 2025

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 28, 2025

k8s-ci-robot merged commit 924b324 into kubernetes:master Jul 28, 2025
14 of 17 checks passed

github-project-automation bot moved this from Triage to Done in SIG Node CI/Test Board Jul 28, 2025

github-project-automation bot moved this from Triage to Done in SIG Node: code and documentation PRs Jul 28, 2025

ContainerRestartRules feature gate should work with probes #133243

ContainerRestartRules feature gate should work with probes #133243

Conversation

yuanwang04 commented Jul 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR is related to:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

Uh oh!

k8s-ci-robot commented Jul 27, 2025

Uh oh!

yuanwang04 commented Jul 27, 2025

Uh oh!

SergeyKanzhelev commented Jul 28, 2025

Uh oh!

SergeyKanzhelev commented Jul 28, 2025

Uh oh!

HirazawaUi commented Jul 28, 2025

Uh oh!

aojea commented Jul 28, 2025

Uh oh!

aojea commented Jul 28, 2025

Uh oh!

Uh oh!

SergeyKanzhelev commented Jul 28, 2025

Uh oh!

SergeyKanzhelev commented Jul 28, 2025

Uh oh!

SergeyKanzhelev commented Jul 28, 2025

Uh oh!

BenTheElder Jul 28, 2025

Choose a reason for hiding this comment

Uh oh!

BenTheElder commented Jul 28, 2025

Uh oh!

BenTheElder commented Jul 28, 2025

Uh oh!

k8s-ci-robot commented Jul 28, 2025

Uh oh!

BenTheElder commented Jul 28, 2025

Uh oh!

BenTheElder commented Jul 28, 2025

Uh oh!

BenTheElder commented Jul 28, 2025

Uh oh!

SergeyKanzhelev left a comment

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented Jul 28, 2025

Uh oh!

k8s-ci-robot commented Jul 28, 2025

Uh oh!

Uh oh!

SergeyKanzhelev commented Jul 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

BenTheElder commented Jul 28, 2025

Uh oh!

Uh oh!

yuanwang04 commented Jul 27, 2025 •

edited

Loading

SergeyKanzhelev commented Jul 28, 2025 •

edited

Loading