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.

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

Revert "Add timestamp to PodSandboxStatusResponse for kubernetes Evented PLEG" #11323

Merged
merged 1 commit into from
Feb 17, 2025

Conversation

chrishenzie
Copy link
Contributor

This reverts commit b529072.

Fixes: #11312

…ted PLEG"

This reverts commit b529072.

Signed-off-by: Chris Henzie <chrishenzie@google.com>
@k8s-ci-robot
Copy link

Hi @chrishenzie. Thanks for your PR.

I'm waiting for a containerd 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.

@dosubot dosubot bot added area/cri Container Runtime Interface (CRI) kind/bug labels Jan 29, 2025
@samuelkarp
Copy link
Member

/ok-to-test

But I'd like to understand how this relates to the original request to add the timestamp in #10728.

@djdongjin
Copy link
Member

The original KEP mentioned there was a PodSandboxStatusRequest.includeContainers to indicate we should include both containerStatuses and timestamp in PodSandboxStatusResponse, but it seems that field is not added to CRI proto.

So it seems we should set both containerStatuses and timestamp (to fully support #10728 ), or set neither.

@hshiina is it the expectation that we should always include both containerStatuses/timestamp in PodSandboxStatusResponse to support PLEG? given there is no such a conditional variable PodSandboxStatusRequest.includeContainers.

@hshiina
Copy link

hshiina commented Jan 30, 2025

The original KEP mentioned there was a PodSandboxStatusRequest.includeContainers to indicate we should include both containerStatuses and timestamp in PodSandboxStatusResponse, but it seems that field is not added to CRI proto.

So it seems we should set both containerStatuses and timestamp (to fully support #10728 ), or set neither.

@hshiina is it the expectation that we should always include both containerStatuses/timestamp in PodSandboxStatusResponse to support PLEG? given there is no such a conditional variable PodSandboxStatusRequest.includeContainers.

I'm sorry I filed the issue only for timestamp just by looking at the code here:
https://github.com/kubernetes/kubernetes/blob/07cc2308c679f5402931ee46879a9edee36f8a4c/pkg/kubelet/kuberuntime/kuberuntime_manager.go#L1634-L1640

The condition for setting containerStatusesandtimestamp` is being reconsidered on kubernetes/kubernetes#129857. It seems better to revert the timestamp addition at the moment.

@chrishenzie
Copy link
Contributor Author

Is there anything blocking or can we proceed?

Copy link
Member

@djdongjin djdongjin left a comment

Choose a reason for hiding this comment

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

Is there anything blocking or can we proceed?

I think we should proceed with the revert. And reopen #10728 with the updated info.

@chrishenzie
Copy link
Contributor Author

/retest

@samuelkarp
Copy link
Member

/retest-required

Thanks for the discussion @hshiina @djdongjin @chrishenzie. Reverting sounds good.

@samuelkarp samuelkarp added cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch labels Feb 5, 2025
Copy link
Member

@samuelkarp samuelkarp left a comment

Choose a reason for hiding this comment

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

LGTM on green CI.

@samuelkarp samuelkarp removed the cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch label Feb 5, 2025
@BenTheElder
Copy link
Contributor

Two consecutive failures with E2eNode Suite: [It] [sig-node] ResourceMetricsAPI [Feature:ResourceMetrics] when querying /resource/metrics should report resource usage through the resource metrics api, is this failing on other PRs?

https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/containerd_containerd/11323/pull-containerd-node-e2e/1887204839893504000

The first run failed on some kubelet authz tests instead: https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/containerd_containerd/11323/pull-containerd-node-e2e/1884671427139866624

https://prow.k8s.io/pr-history/?org=containerd&repo=containerd&pr=11323

@chrishenzie
Copy link
Contributor Author

chrishenzie commented Feb 5, 2025

It looks like yeah, it's also failing on #11311 which was opened last week as well.

Job history shows it started failing recently due to timeouts

@chrishenzie
Copy link
Contributor Author

/retest

@chrishenzie
Copy link
Contributor Author

The failing test here does not appear related to this change and has been consistently failing the past couple days. Is it possible to proceed despite this?

@BenTheElder
Copy link
Contributor

@BenTheElder
Copy link
Contributor

All green now :-)

@chrishenzie
Copy link
Contributor Author

Thanks! Although it looks like this is also being fixed on the k8s end (kubernetes/kubernetes#129990) so maybe we should hold off on making changes here?

@BenTheElder
Copy link
Contributor

@HirazawaUi
Copy link

Regardless of whether kubernetes/kubernetes#129990 gets merged, the current PR remains necessary. As defined in original KEP), we should return the PodSandboxStatusResponse.Timestamp and PodSandboxStatusResponse.containerStatuses fields when PodSandboxStatusRequest.includeContainers is set to true.

Although we haven't added the PodSandboxStatusRequest.includeContainers field to CRI, I believe the PodSandboxStatusResponse.Timestamp and PodSandboxStatusResponse.containerStatuses fields should either both be assigned values simultaneously or neither should be assigned.

Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

@mikebrow mikebrow added this pull request to the merge queue Feb 17, 2025
Merged via the queue into containerd:main with commit f7149a9 Feb 17, 2025
59 checks passed
@djdongjin
Copy link
Member

/cherry-pick release/2.0

@k8s-infra-cherrypick-robot

@djdongjin: new pull request created: #11403

In response to this:

/cherry-pick release/2.0

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/cri Container Runtime Interface (CRI) cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch kind/bug ok-to-test size/XS
Projects
Development

Successfully merging this pull request may close these issues.

Fixing the Value of the Timestamp Field in the PodSandboxStatus
9 participants