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.

Sign up for GitHub

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

Jump to bottom

Bug 1827143: daemon: consider addition of an RT kernel package as update #1691

Merged
merged 1 commit into from
Apr 28, 2020
Merged

Bug 1827143: daemon: consider addition of an RT kernel package as update #1691

merged 1 commit into from
Apr 28, 2020

Conversation

sinnykumari
Copy link
Contributor

Install additional RT kernel package if any shipped
as part of update in machine-os-content

Also some code cleanup to simplify RT kernel update logic

@sinnykumari
daemon: consider addition of an RT kernel package as update
7e3c25b 
Install additional RT kernel package if any shipped
as part of update in machine-os-content

Also some code cleanup to simplify RT kernel update logic

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1827143
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Apr 28, 2020
@openshift-ci-robot
Copy link
Contributor

@sinnykumari: This pull request references Bugzilla bug 1827143, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1827143: daemon: consider addition of an RT kernel package as update

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.

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Apr 28, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 28, 2020
@sinnykumari
Copy link
Contributor Author

Not tested yet
/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 28, 2020
@runcom
Copy link
Member

runcom commented Apr 28, 2020

/retest

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 28, 2020 •
edited

@sinnykumari: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-aws-scaleup-rhel7 7e3c25b link /test e2e-aws-scaleup-rhel7

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

@runcom
Copy link
Member

runcom commented Apr 28, 2020

/skip

@sinnykumari
Copy link
Contributor Author

Looks good, relevant log from one of the m-c-d pod during 4.4 to 4.5 upgrade

...
I0428 14:15:20.064524  114005 update.go:1346] Updating rt-kernel packages on host: ["uninstall" "kernel-rt-core-4.18.0-147.8.1.rt24.101.el8_1.x86_64" "kernel-rt-modules-4.18.0-147.8.1.rt24.101.el8_1.x86_64" "kernel-rt-modules-extra-4.18.0-147.8.1.rt24.101.el8_1.x86_64" "--install" "/var/lib/containers/storage/overlay/6e1baae6f2e878f032034a02d488dfbe5ab467292c606156907c2b79cf9268e7/merged/kernel-rt-core-4.18.0-147.8.1.rt24.101.el8_1.x86_64.rpm" "--install" "/var/lib/containers/storage/overlay/6e1baae6f2e878f032034a02d488dfbe5ab467292c606156907c2b79cf9268e7/merged/kernel-rt-kvm-4.18.0-147.8.1.rt24.101.el8_1.x86_64.rpm" "--install" "/var/lib/containers/storage/overlay/6e1baae6f2e878f032034a02d488dfbe5ab467292c606156907c2b79cf9268e7/merged/kernel-rt-modules-4.18.0-147.8.1.rt24.101.el8_1.x86_64.rpm" "--install" "/var/lib/containers/storage/overlay/6e1baae6f2e878f032034a02d488dfbe5ab467292c606156907c2b79cf9268e7/merged/kernel-rt-modules-extra-4.18.0-147.8.1.rt24.101.el8_1.x86_64.rpm"]


...
I0428 14:22:26.917565    2185 rpm-ostree.go:368] Running captured: rpm-ostree status
I0428 14:22:27.140608    2185 daemon.go:814] State: idle
AutomaticUpdates: disabled
Deployments:
* pivot://registry.svc.ci.openshift.org/ci-ln-4b5gsm2/stable@sha256:c19d5e4c7db297cc357b770ae11dea25f41b24b0ba3ef637da4ce5de31d219e9
              CustomOrigin: Managed by machine-config-operator
                   Version: 45.81.202004241728-0 (2020-04-24T17:34:15Z)
       RemovedBasePackages: kernel-core kernel-modules kernel kernel-modules-extra 4.18.0-147.8.1.el8_1
             LocalPackages: kernel-rt-kvm-4.18.0-147.8.1.rt24.101.el8_1.x86_64
                            kernel-rt-core-4.18.0-147.8.1.rt24.101.el8_1.x86_64
                            kernel-rt-modules-4.18.0-147.8.1.rt24.101.el8_1.x86_64
                            kernel-rt-modules-extra-4.18.0-147.8.1.rt24.101.el8_1.x86_64

  pivot://quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8cea2679f40cd5e5bb95b7f511d444ea7ad74800bcc366d0129eb682459cdffd
              CustomOrigin: Managed by machine-config-operator
                   Version: 44.81.202004260825-0 (2020-04-26T08:30:26Z)
       RemovedBasePackages: kernel-core kernel-modules kernel kernel-modules-extra 4.18.0-147.8.1.el8_1
             LocalPackages: kernel-rt-core-4.18.0-147.8.1.rt24.101.el8_1.x86_64
                            kernel-rt-modules-4.18.0-147.8.1.rt24.101.el8_1.x86_64
                            kernel-rt-modules-extra-4.18.0-147.8.1.rt24.101.el8_1.x86_64
...

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 28, 2020
@sinnykumari
Copy link
Contributor Author

/cc @cgwalters @runcom

@runcom
Copy link
Member

runcom commented Apr 28, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 28, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: runcom, sinnykumari

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

@openshift-merge-robot openshift-merge-robot merged commit 9ba5c1a into openshift:master Apr 28, 2020
@openshift-ci-robot
Copy link
Contributor

@sinnykumari: All pull requests linked via external trackers have merged: openshift/machine-config-operator#1691. Bugzilla bug 1827143 has been moved to the MODIFIED state.

In response to this:

Bug 1827143: daemon: consider addition of an RT kernel package as update

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.

@cgwalters
Copy link
Member

LGTM, thanks for doing this! The code is definitely better now that we're just reading the parsed rpm-ostree JSON state instead of calling out to the subprocess again.

One thing that might make sense as part of coreos/fedora-coreos-tracker#401
is to have a simple file that's something like:

extensions.yaml:
kernel-rt:
  - kernel-rt
  - kernel-rt-kvm
  - kernel-rt-modules
usbguard: {}

or something so that we have an abstraction between "feature name" and "list of RPMs making up feature" - kind of like metapackages I guess.

@runcom
Copy link
Member

runcom commented Apr 28, 2020

usbguard: {}

do we really want this 😭 I proposed another way of tackling what I think are security options using something like "securityLevels" or profiles. You just set that in an MC and the MCO knows what to install (much like we do with kernelTypeas it's not kernelRT: true). We would have securityLevel: 1 for instance and the MCO installs usbguard for instance - not sure how practical that would be but let's see

@cgwalters
Copy link
Member

Definitely worth discussing a higher level interface!

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

@kikisdeliveryservice kikisdeliveryservice Awaiting requested review from kikisdeliveryservice

@yuqi-zhang yuqi-zhang Awaiting requested review from yuqi-zhang

@cgwalters cgwalters Awaiting requested review from cgwalters

@runcom runcom Awaiting requested review from runcom

Assignees

@runcom runcom

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@sinnykumari @openshift-ci-robot @runcom @cgwalters @openshift-merge-robot