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

config, docs, completions: enable NRI by default. #7790

Merged
merged 2 commits into from
Apr 5, 2024

Conversation

klihub
Copy link
Contributor

@klihub klihub commented Feb 19, 2024

What type of PR is this?

/kind other

What this PR does / why we need it:

Flip NRI on in the default configuration.

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

As discussed in the last community meeting, this PR flips NRI on in the default configuration.

For maintaining command line backward compatibility this PR leaves the original --enable-nri command line option intact, only changing its default to true from false (as opposed to flipping it to --disable-nri=[false]). Hence, NRI can now be disabled on the command line using the --enable-nri=false option.

Does this PR introduce a user-facing change?

Flip NRI on by default.
To revert to a configuration with NRI disabled, either either pass the `--enable-nri=false` option to crio
on the command line, or set the `enable_nri = false` in the `[crio.nri]` section of the configuration.

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
@klihub klihub requested a review from mrunalp as a code owner February 19, 2024 12:31
@openshift-ci openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/other Categorizes issue or PR as not clearly related to any existing kind/* category dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Feb 19, 2024
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

/hold

for other @cri-o/cri-o-maintainers to chime in

@openshift-ci openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 19, 2024
Copy link

codecov bot commented Feb 19, 2024

Codecov Report

Merging #7790 (474fc77) into main (b9a3d4d) will increase coverage by 0.81%.
Report is 139 commits behind head on main.
The diff coverage is n/a.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #7790      +/-   ##
==========================================
+ Coverage   48.56%   49.37%   +0.81%     
==========================================
  Files         148      148              
  Lines       16187    16187              
==========================================
+ Hits         7861     7993     +132     
+ Misses       7365     7204     -161     
- Partials      961      990      +29     

@haircommander
Copy link
Member

/retest

LGTM

@saschagrunert
Copy link
Member

/retest

@klihub
Copy link
Contributor Author

klihub commented Feb 20, 2024

/hold

@saschagrunert @haircommander
I think I know what's wrong. Some of the tests (that used to run with NRI turned off) now clash on the stock NRI socket path when run in parallel... I'll take a look at it.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 20, 2024
Now that NRI is on by default, we always need to configure the
NRI socket to a testcase-specific location to ensure that test
cases can run parallel.

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>
@sohankunkerkar
Copy link
Member

/retest

Copy link
Member

@sohankunkerkar sohankunkerkar left a comment

Choose a reason for hiding this comment

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

/retest
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 20, 2024
Copy link
Contributor

openshift-ci bot commented Feb 20, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: klihub, saschagrunert, sohankunkerkar

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

Copy link

A friendly reminder that this PR had no activity for 30 days.

@github-actions github-actions bot added lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels Mar 22, 2024
@saschagrunert
Copy link
Member

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 4, 2024
@haircommander haircommander added this to the 1.30 milestone Apr 4, 2024
@saschagrunert
Copy link
Member

/retest

@saschagrunert
Copy link
Member

/override ci/prow/ci-cgroupv2-e2e
/override ci/prow/ci-e2e-conmonrs

Copy link
Contributor

openshift-ci bot commented Apr 5, 2024

@saschagrunert: Overrode contexts on behalf of saschagrunert: ci/prow/ci-cgroupv2-e2e, ci/prow/ci-e2e-conmonrs

In response to this:

/override ci/prow/ci-cgroupv2-e2e
/override ci/prow/ci-e2e-conmonrs

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/test-infra repository.

@haircommander
Copy link
Member

/retest

@klihub
Copy link
Contributor Author

klihub commented Apr 5, 2024

@haircommander I recall having seen occasional failures of the timezone tests in images.bat, and IIRC either with this local timezone test failing or the previous one with the explicit/specific timezone test.

I cannot prove it at the moment without doubt (unfortunately the details of the failed test verification are not dumped on failure), but looking at the actual test case implementation, I suspect the reason for flakes is that it implicitly assumes that running foo=$(date ...) twice, once on the host then in the container and with second resolution will always produce the same timestamp. IOW, it is assumed that running the first date command will never happen close enough to the 'end' of a second with the second date run taking long enough for the time to flip over to the next second... in which case the test is guaranteed to fail.

I have a change (I'd like to call it a fix but in lack of definite proof I won't), which takes a single timestamp in seconds and reuses that in both date formatting to verify that the timezones are correctly taken into account... which is what the test really tries to test.

One of the test failures in the previous /retest-cycle was that test case failing, which is why I took a closer look at the test case itself and I noticed it to be a bit iffy...

@haircommander Do you think it is worth a PR/fix for me to file ?

@haircommander
Copy link
Member

@haircommander Do you think it is worth a PR/fix for me to file

absolutely!

@openshift-merge-bot openshift-merge-bot bot merged commit 183f28b into cri-o:main Apr 5, 2024
65 checks passed
@klihub klihub deleted the devel/nri-on-by-default branch April 8, 2024 06:29
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/other Categorizes issue or PR as not clearly related to any existing kind/* category lgtm Indicates that a PR is ready to be merged. 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.

None yet

4 participants