Skip to content

Conversation

@tariq1890
Copy link
Contributor

@tariq1890 tariq1890 commented Apr 14, 2025

What type of PR is this?

/kind feature

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #9122

Special notes for your reviewer:

This PR brings the status endpoint implementation to parity with that of containerd. We would like the ability to retrieve the active runtime config through CRI socket invocation.

The other option is for us to import the cri-o package to reuse the same business logic as crio status config. This option is undesirable as importing cri-o brings in a significant dependency overhead

Does this PR introduce a user-facing change?

Added runtime config block to the `StatusResponse` returned by the CRI Status endpoint.

@tariq1890 tariq1890 requested a review from mrunalp as a code owner April 14, 2025 06:26
@openshift-ci openshift-ci bot added kind/feature Categorizes issue or PR as related to a new feature. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Apr 14, 2025
@openshift-ci openshift-ci bot requested review from QiWang19 and hasan4791 April 14, 2025 06:26
@openshift-ci openshift-ci bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 14, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 14, 2025

Hi @tariq1890. Thanks for your PR.

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

@openshift-ci openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 14, 2025
@saschagrunert
Copy link
Member

/ok-to-test

@openshift-ci openshift-ci bot 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 Apr 14, 2025
@saschagrunert
Copy link
Member

@tariq1890 do you mind adding an integration test for that use case?

@tariq1890 tariq1890 force-pushed the status-svc-crio-config branch 3 times, most recently from b5d518c to 0b506d7 Compare April 17, 2025 06:51
@tariq1890
Copy link
Contributor Author

@saschagrunert Done, ready for another round of review

@tariq1890 tariq1890 force-pushed the status-svc-crio-config branch from 0b506d7 to f7caec2 Compare April 17, 2025 06:53
@codecov
Copy link

codecov bot commented Apr 17, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 47.00%. Comparing base (2f2b3ab) to head (dd38a18).
Report is 5 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #9129   +/-   ##
=======================================
  Coverage   46.99%   47.00%           
=======================================
  Files         161      161           
  Lines       23634    23635    +1     
=======================================
+ Hits        11107    11109    +2     
+ Misses      11427    11426    -1     
  Partials     1100     1100           
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@saschagrunert
Copy link
Member

/retest

@tariq1890 tariq1890 force-pushed the status-svc-crio-config branch from f7caec2 to 8de7570 Compare April 17, 2025 15:59
@tariq1890 tariq1890 force-pushed the status-svc-crio-config branch 3 times, most recently from b68a809 to ad61d2f Compare April 17, 2025 18:32
@tariq1890
Copy link
Contributor Author

tariq1890 commented Apr 17, 2025

Looks like the [integration / integration / conmon / runc / amd64] fail in unrelated to the changes

@tariq1890
Copy link
Contributor Author

/retest-required

@tariq1890 tariq1890 requested a review from bitoku April 22, 2025 06:40
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 22, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bitoku, saschagrunert, tariq1890

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

@haircommander
Copy link
Member

/override ci/prow/ci-e2e-evented-pleg

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 22, 2025

@haircommander: Overrode contexts on behalf of haircommander: ci/prow/ci-e2e-evented-pleg

In response to this:

/override ci/prow/ci-e2e-evented-pleg

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.

@tariq1890
Copy link
Contributor Author

This is the failure I see in the ci-fedora-kata logs. Possible flake?

step fedora-kata failed: "fedora-kata" test steps failed: "fedora-kata" pod "fedora-kata-cri-o-fedora-kata-test" failed: could not watch pod: the pod ci-op-ip2vmvlp/fedora-kata-cri-o-fedora-kata-test failed after 1h19m14s (failed containers: test): ContainerFailed one or more containers exited

Is this required?

@bitoku
Copy link
Contributor

bitoku commented Apr 22, 2025

@tariq1890 unfortunately it's not flake.
https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/test-platform-results/pr-logs/pull/cri-o_cri-o/9129/pull-ci-cri-o-cri-o-main-ci-fedora-kata/1914574536410402816/artifacts/fedora-kata/cri-o-gather/artifacts/testout.txt

Apparently it failed here.

cri-o/test/helpers.bash

Lines 90 to 93 in e429f75

# Run the runtime binary with the specified RUNTIME_ROOT
function runtime() {
"$RUNTIME_BINARY_PATH" --root "$RUNTIME_ROOT" "$@"
}

@tariq1890
Copy link
Contributor Author

Thanks for pointing that out @bitoku. So it looks like I can't use the runtime() method as containerd-kata-shim-v2 does not have the --root flag :(. It means I probably need to modify the test

@tariq1890 tariq1890 force-pushed the status-svc-crio-config branch from ad61d2f to f80ed39 Compare April 22, 2025 17:57
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 22, 2025
@tariq1890
Copy link
Contributor Author

I am having a bit of trouble reading the logs, so I am not sure if these failures are related to my changes

@tariq1890 tariq1890 force-pushed the status-svc-crio-config branch from f80ed39 to 1cedef0 Compare April 23, 2025 23:57
@tariq1890 tariq1890 force-pushed the status-svc-crio-config branch from 1cedef0 to dd38a18 Compare April 24, 2025 02:02
@tariq1890
Copy link
Contributor Author

@bitoku
Copy link
Contributor

bitoku commented Apr 24, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 24, 2025
@bitoku
Copy link
Contributor

bitoku commented Apr 24, 2025

/retest

@sohankunkerkar
Copy link
Member

/override ci/prow/ci-cgroupv2-integration
/override ci/prow/ci-e2e-evented-pleg

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 24, 2025

@sohankunkerkar: Overrode contexts on behalf of sohankunkerkar: ci/prow/ci-cgroupv2-integration, ci/prow/ci-e2e-evented-pleg

In response to this:

/override ci/prow/ci-cgroupv2-integration
/override ci/prow/ci-e2e-evented-pleg

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.

@sohankunkerkar
Copy link
Member

/retest

@openshift-merge-bot openshift-merge-bot bot merged commit 17ac08c into cri-o:main Apr 24, 2025
74 of 76 checks passed
@tariq1890 tariq1890 deleted the status-svc-crio-config branch April 24, 2025 18:14
@tariq1890
Copy link
Contributor Author

Thanks to everyone for helping with this PR :)

Is it possible to backport this to release-1.33?

@sohankunkerkar
Copy link
Member

1.33 hasn't released yet
were you referring to 1.32?

@tariq1890
Copy link
Contributor Author

I was referring to 1.33. I was unsure if the release-1.33 was under code freeze or not. If we can backport this to 1.32, that would be great too

@sohankunkerkar
Copy link
Member

sohankunkerkar commented Apr 24, 2025

Since it's a feature, I'd wait for the new release and then we can backport it to the older releases.

@tariq1890
Copy link
Contributor Author

That makes sense, thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/feature Categorizes issue or PR as related to a new feature. lgtm 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. release-note Denotes a PR that will be considered when it comes time to generate release notes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Feature Request] Print current config of cri-o in CRI Status endpoint output/crictl info command

5 participants