Skip to content

Conversation

@openshift-cherrypick-robot

This is an automated cherry-pick of #1219

/assign rbaturov

A new patch has been introduced for CRI-O, allowing the container runtime for the high-performance runtime class to be inherited from the system instead of being detected and explicitly set. cri-o/cri-o#8753

As a result, the controller no longer needs to identify the container runtime from the containerRuntimeConfig for setting it in the 99-runtimes.conf snippet.

Signed-off-by: Ronny Baturov <rbaturov@redhat.com>
This snippet necessity has been questioned in the first time added, and perhaps wasn't needed to be added.
Moreover, we are now inheriting crio configuration .
The tests in the latter commit can verify this is redundant.

Signed-off-by: Ronny Baturov <rbaturov@redhat.com>
Previously, we monitored the containerRuntimeConfig for changes to update the CRI-O configuration for the high-performance runtime class. Since this is no longer necessary, we should remove this logic.

Signed-off-by: Ronny Baturov <rbaturov@redhat.com>
This commit removes rendering for the containerRuntimeConfig.

Signed-off-by: Ronny Baturov <rbaturov@redhat.com>
The GetContainerRuntimeTypeFor function has been updated to provide more accurate output regarding the runtime class used on the node. Previously, it relied on reading the runtime path from the CRI-O configuration file, but this is no longer viable, as the runtime path is no longer written to the file. The new approach directly checks the container process on the node using the ps tool to determine the runtime in use.
The new command outputs the conmon process of the container and greps the container runtime from the -r argument using regex.

For example:
/bin/ps aux | grep 'tuned-ncp4j'
root        6317  0.0  0.0   8312  1600 ?        Ss   12:25   0:00 /usr/bin/conmon -b /run/containers/storage/overlay-containers/f492c7c342b71.../userdata/conmon-pidfile -p /run/containers/storage/overlay-containers/f492c7c342b71e19e.../userdata/pidfile --persist-dir /var/lib/containers/storage/overlay-containers/f492c7c342b7..../userdata -r /usr/bin/crun --runtime-arg --root=/run/crun --socket-dir-path /var/run/crio --syslog -u f492c7c3... -s
root       90775  0.0  0.0   3332  1600 ?        S+   13:57   0:00 grep tuned-ncp4j

Signed-off-by: Ronny Baturov <rbaturov@redhat.com>
When we have no ContainerRuntimeConfig in the system, the high-performance class should use the runtime that is currently being used in the system. This should be crun for 4.18 systems, or runc if upgraded from older version and not explicitly switched to crun.
Since the selected runtime is not directly exposed, we target the tuned pod to determine which runtime is handling it, using this as an indicator for the node's default runtime.
Moreover, instead of checking the container runtime for the high-performance pods from the conf file (which no longer is possible), we will create a test pod and check the container runtime used in practice.

Signed-off-by: Ronny Baturov <rbaturov@redhat.com>
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 2, 2024

@openshift-cherrypick-robot: Ignoring requests to cherry-pick non-bug issues: CNF-15505

Details

In response to this:

This is an automated cherry-pick of #1219

/assign rbaturov

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested review from Tal-or and dagrayvid December 2, 2024 16:39
@rbaturov
Copy link
Contributor

rbaturov commented Dec 2, 2024

/test e2e-pao-updating-profile-hypershift

@rbaturov
Copy link
Contributor

rbaturov commented Dec 2, 2024

/jira cherrypick CNF-15505

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 2, 2024

@rbaturov: Ignoring requests to cherry-pick non-bug issues: CNF-15505

Details

In response to this:

/jira cherrypick CNF-15505

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 openshift-eng/jira-lifecycle-plugin repository.

@rbaturov
Copy link
Contributor

rbaturov commented Dec 3, 2024

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 3, 2024

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@rbaturov
Copy link
Contributor

rbaturov commented Dec 3, 2024

/hold
If we choose to merge this patch, 4.17 to 4.18 upgrade will cause update to crun under the hood, until this PR will be merged.
On the other hand, not merging this patch will result with using runc for 4.18 new clusters (which suppose to be crun).

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 3, 2024
@rbaturov
Copy link
Contributor

rbaturov commented Dec 3, 2024

/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 Dec 3, 2024
@MarSik
Copy link
Contributor

MarSik commented Dec 3, 2024

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Dec 3, 2024
@yanirq
Copy link
Contributor

yanirq commented Dec 3, 2024

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 3, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, yanirq

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 3, 2024
@yanirq
Copy link
Contributor

yanirq commented Dec 3, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 3, 2024
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Dec 3, 2024

@yanirq: This pull request references CNF-15505 which is a valid jira issue.

Details

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@mrniranjan
Copy link
Contributor

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Dec 4, 2024
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 4, 2024
@rbaturov
Copy link
Contributor

rbaturov commented Dec 4, 2024

/retitle [release-4.18] OCPBUGS-45442: Remove container runtime selection

@openshift-ci openshift-ci bot changed the title [release-4.18] CNF-15505: Remove container runtime selection [release-4.18] OCPBUGS-45442: Remove container runtime selection Dec 4, 2024
@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Dec 4, 2024
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-45442, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected Jira Issue OCPBUGS-45442 to depend on a bug targeting a version in 4.19.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #1219

/assign rbaturov

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 openshift-eng/jira-lifecycle-plugin repository.

@rbaturov
Copy link
Contributor

rbaturov commented Dec 4, 2024

/retitle [release-4.18]: Remove container runtime selection

@openshift-ci openshift-ci bot changed the title [release-4.18] OCPBUGS-45442: Remove container runtime selection [release-4.18]: Remove container runtime selection Dec 4, 2024
@openshift-ci-robot openshift-ci-robot removed jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 4, 2024
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

Details

In response to this:

This is an automated cherry-pick of #1219

/assign rbaturov

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 openshift-eng/jira-lifecycle-plugin repository.

@rbaturov
Copy link
Contributor

rbaturov commented Dec 4, 2024

/jira cherrypick OCPBUGS-45442

@openshift-ci-robot
Copy link
Contributor

@rbaturov: Jira Issue OCPBUGS-45442 has been cloned as Jira Issue OCPBUGS-45450. Will retitle bug to link to clone.
/retitle OCPBUGS-45450: [release-4.18]: Remove container runtime selection

Details

In response to this:

/jira cherrypick OCPBUGS-45442

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot changed the title [release-4.18]: Remove container runtime selection OCPBUGS-45450: [release-4.18]: Remove container runtime selection Dec 4, 2024
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 4, 2024
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-45450, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected dependent Jira Issue OCPBUGS-45442 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is ASSIGNED instead
  • expected dependent Jira Issue OCPBUGS-45442 to target a version in 4.19.0, but it targets "4.19" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #1219

/assign rbaturov

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Dec 4, 2024
@yanirq
Copy link
Contributor

yanirq commented Dec 4, 2024

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@yanirq: This pull request references Jira Issue OCPBUGS-45450, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected dependent Jira Issue OCPBUGS-45442 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is ASSIGNED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@yanirq
Copy link
Contributor

yanirq commented Dec 4, 2024

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@yanirq: This pull request references Jira Issue OCPBUGS-45450, which is invalid:

  • expected dependent Jira Issue OCPBUGS-45442 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is ASSIGNED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@yanirq
Copy link
Contributor

yanirq commented Dec 4, 2024

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@yanirq: This pull request references Jira Issue OCPBUGS-45450, which is invalid:

  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is ON_QA instead
  • expected dependent Jira Issue OCPBUGS-45442 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is ASSIGNED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@yanirq
Copy link
Contributor

yanirq commented Dec 4, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 4, 2024
@openshift-ci-robot
Copy link
Contributor

@yanirq: This pull request references Jira Issue OCPBUGS-45450, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.0) matches configured target version for branch (4.18.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-45442 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-45442 targets the "4.19.0" version, which is one of the valid target versions: 4.19.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (liqcui@redhat.com), skipping review request.

Details

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-merge-bot openshift-merge-bot bot merged commit 29c9702 into openshift:release-4.18 Dec 4, 2024
@openshift-ci-robot
Copy link
Contributor

@openshift-cherrypick-robot: Jira Issue OCPBUGS-45450: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-45450 has been moved to the MODIFIED state.

Details

In response to this:

This is an automated cherry-pick of #1219

/assign rbaturov

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: cluster-node-tuning-operator
This PR has been included in build cluster-node-tuning-operator-container-v4.18.0-202412041108.p0.g29c9702.assembly.stream.el9.
All builds following this will include this PR.

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. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants