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

NO-JIRA: okd-scos: pin clevis to 20-200.el9 #1631

Merged
merged 1 commit into from
Oct 9, 2024

Conversation

Prashanth684
Copy link
Contributor

Latest clevis pulls in opensc and pcsc-lite which gives this error on booting:

[    1.931395] dracut-initqueue[621]: pcscd: unrecognized option '--disable-polkit'
[    1.742582] dracut-initqueue[621]: pcscd: unrecognized option '--disable-polkit'
[    1.933525] dracut-initqueue[621]: Usage: pcscd options
[    1.933837] dracut-initqueue[621]: Options:
[[0;32m  OK  [[    1.934124] dracut-initqueue[621]:   -a, --apdu		log APDU commands and results
0m] Found device [0;1;39mAmazon Elastic Block Store root[0m.[    1.934449] dracut-initqueue[621]:   -c, --config		path to reader.conf
[    1.934737] dracut-initqueue[621]:   -f, --foreground	run in foreground (no daemon),

[    1.935028] dracut-initqueue[621]: 			send logs to stdout instead of syslog
[    1.935341] dracut-initqueue[621]:   -T, --color		force use of colored logs
[    1.935628] dracut-initqueue[621]:   -h, --help		display usage information
[    1.935912] dracut-initqueue[621]:   -H, --hotplug		ask the daemon to rescan the available readers
[[0;32m  OK  [0m] Reached target [0;1;39mInit[    1.936468] dracut-initqueue[621]:   -v, --version		display the program version number
rd Root Device[[    1.936748] dracut-initqueue[621]:   -d, --debug		display lower level debug messages
0m.
[    1.937028] dracut-initqueue[621]:   -i, --info		display info level debug messages
[    1.937316] dracut-initqueue[621]:   -e  --error		display error level debug messages (default level)
[    1.937834] dracut-initqueue[621]:   -C  --critical	display critical only level debug messages
[    1.938109] dracut-initqueue[621]:   --force-reader-polling ignore the IFD_GENERATE_HOTPLUG reader capability
[    1.938665] dracut-initqueue[621]:   -t, --max-thread	maximum number of threads (default 200)
[    1.938948] dracut-initqueue[621]:   -s, --max-card-handle-per-thread	maximum number of card handle per thread (default: 200)
[    1.939509] dracut-initqueue[621]:   -r, --max-card-handle-per-reader	maximum number of card handle per reader (default: 200)
[    1.940064] dracut-initqueue[621]:   -x, --auto-exit	pcscd will quit after 60 seconds of inactivity
[    1.940632] dracut-initqueue[621]:   -S, --reader-name-no-serial    do not include the USB serial number in the name

This addresses #1630 until https://issues.redhat.com/browse/RHEL-61612 has been fixed.

@ausil
Copy link

ausil commented Oct 7, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 7, 2024
@ausil
Copy link

ausil commented Oct 8, 2024

/retest

@ausil
Copy link

ausil commented Oct 8, 2024

/assign mike-nguyen

@mike-nguyen
Copy link
Member

/retitle NO-JIRA: okd-scos: pin clevis to 20-200.el9

@openshift-ci openshift-ci bot changed the title okd-scos: pin clevis to 20-200.el9 NO-JIRA: okd-scos: pin clevis to 20-200.el9 Oct 8, 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 Oct 8, 2024
@openshift-ci-robot
Copy link

@Prashanth684: This pull request explicitly references no jira issue.

In response to this:

Latest clevis pulls in opensc and pcsc-lite which gives this error on booting:

[    1.931395] dracut-initqueue[621]: pcscd: unrecognized option '--disable-polkit'
[    1.742582] dracut-initqueue[621]: pcscd: unrecognized option '--disable-polkit'
[    1.933525] dracut-initqueue[621]: Usage: pcscd options
[    1.933837] dracut-initqueue[621]: Options:
[[0;32m  OK  [[    1.934124] dracut-initqueue[621]:   -a, --apdu		log APDU commands and results
0m] Found device [0;1;39mAmazon Elastic Block Store root[0m.[    1.934449] dracut-initqueue[621]:   -c, --config		path to reader.conf
[    1.934737] dracut-initqueue[621]:   -f, --foreground	run in foreground (no daemon),

[    1.935028] dracut-initqueue[621]: 			send logs to stdout instead of syslog
[    1.935341] dracut-initqueue[621]:   -T, --color		force use of colored logs
[    1.935628] dracut-initqueue[621]:   -h, --help		display usage information
[    1.935912] dracut-initqueue[621]:   -H, --hotplug		ask the daemon to rescan the available readers
[[0;32m  OK  [0m] Reached target [0;1;39mInit[    1.936468] dracut-initqueue[621]:   -v, --version		display the program version number
rd Root Device[[    1.936748] dracut-initqueue[621]:   -d, --debug		display lower level debug messages
0m.
[    1.937028] dracut-initqueue[621]:   -i, --info		display info level debug messages
[    1.937316] dracut-initqueue[621]:   -e  --error		display error level debug messages (default level)
[    1.937834] dracut-initqueue[621]:   -C  --critical	display critical only level debug messages
[    1.938109] dracut-initqueue[621]:   --force-reader-polling ignore the IFD_GENERATE_HOTPLUG reader capability
[    1.938665] dracut-initqueue[621]:   -t, --max-thread	maximum number of threads (default 200)
[    1.938948] dracut-initqueue[621]:   -s, --max-card-handle-per-thread	maximum number of card handle per thread (default: 200)
[    1.939509] dracut-initqueue[621]:   -r, --max-card-handle-per-reader	maximum number of card handle per reader (default: 200)
[    1.940064] dracut-initqueue[621]:   -x, --auto-exit	pcscd will quit after 60 seconds of inactivity
[    1.940632] dracut-initqueue[621]:   -S, --reader-name-no-serial    do not include the USB serial number in the name

This addresses #1630 until https://issues.redhat.com/browse/RHEL-61612 has been fixed.

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.

@Prashanth684
Copy link
Contributor Author

/test scos-9-build-test-qemu


#packages:
packages:
Copy link
Member

Choose a reason for hiding this comment

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

Can you add a comment referencing https://issues.redhat.com/browse/RHEL-61612 for the pinned packages?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done.

@mike-nguyen
Copy link
Member

CI picked up the pinned packages

  clevis-20-200.el9.x86_64 (c9s-appstream-mirror)
  clevis-dracut-20-200.el9.x86_64 (c9s-appstream-mirror)
  clevis-luks-20-200.el9.x86_64 (c9s-appstream-mirror)
  clevis-systemd-20-200.el9.x86_64 (c9s-appstream-mirror)
  clevis-udisks2-20-200.el9.x86_64 (c9s-appstream-mirror)

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 8, 2024
@mike-nguyen
Copy link
Member

/test scos-9-build-test-qemu

@mike-nguyen
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added 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 Oct 8, 2024
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD b753d25 and 2 for PR HEAD ca06e32 in total

2 similar comments
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD b753d25 and 2 for PR HEAD ca06e32 in total

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD b753d25 and 2 for PR HEAD ca06e32 in total

@mike-nguyen
Copy link
Member

/usr/libexec/clevis-luks-udisks2 has setuid bit set which either doesn't exist in the newer version or is set properly in the newer version.

Either this test should be updated to allow the binary or you can add the test to the kola-denylist to skip it from running.

@jbtrystram
Copy link
Contributor

jbtrystram commented Oct 9, 2024

The failing test is https://github.com/coreos/fedora-coreos-config/blob/testing-devel/tests/kola/files/setuid which is not happy about clevis-luks-udisks2 being a setuid binary.
Digging a bit it looks like it's been like this since the inital rhel 9.0 import so I am not sure why we only hit this now. I'll update the FCOS test.

Edit : I was not fast enough 🥈

jbtrystram added a commit to jbtrystram/fedora-coreos-config that referenced this pull request Oct 9, 2024
`clevis-luks-udisks2` shipped as a subpackage of clevis have the
setuid bit set [1].
I am not sure why this is failing only now since it's been enabled for
a long time.

[1]: https://gitlab.com/redhat/centos-stream/rpms/clevis/-/commit/ca4761025e6332e6d0e148f59833506b1f6b7470#4b7d5bd4b543f32d3da8004f4e1de346e6a2c2c9_0_184

Also see openshift/os#1631 (comment)
@jbtrystram
Copy link
Contributor

jbtrystram commented Oct 9, 2024

/usr/libexec/clevis-luks-udisks2 has setuid bit set which either doesn't exist in the newer version or is set properly in the newer version.

Well i was confused by that and it appears it has had the setuid bit since the package was introduced in c9s : https://gitlab.com/redhat/centos-stream/rpms/clevis/-/blob/c10s/clevis.spec?ref_type=heads#L203
Maybe we were not pulling that before ?

Edit : it's been setuid since the package exist in fedora : see line 94 of the initial commit

@jbtrystram
Copy link
Contributor

This binary comes as a subpackage of clevis, in the package clevis-udisk2, and we don't pull subpackages by default, that's why it was not present before.

- clevis-dracut-20-200.el9
- clevis-luks-20-200.el9
- clevis-systemd-20-200.el9
- clevis-udisks2-20-200.el9
Copy link
Contributor

Choose a reason for hiding this comment

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

clevis-udisks2 is not included in the image. Any reason to add it ?

Copy link

Choose a reason for hiding this comment

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

I do not think we should add it

Copy link
Contributor Author

Choose a reason for hiding this comment

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

so is it not being pulled by any other packages? if so, I can remove it - but I'm not sure how we determine that.

Copy link
Contributor

@jbtrystram jbtrystram Oct 9, 2024

Choose a reason for hiding this comment

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

I checked on a local build and it's not pulled :)
You can also look at the contents of a recent openshift RHCOS build : https://releases-rhcos-art.apps.ocp-virt.prod.psi.redhat.com/contents.html?stream=prod/streams/4.18-9.4&release=418.94.202410090804-0&arch=x86_64

Also see my comment above : we don't pull subpackages by default in ostree builds, unless they are marked as required, which isn't the case here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed the package.

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD b753d25 and 2 for PR HEAD ca06e32 in total

1 similar comment
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD b753d25 and 2 for PR HEAD ca06e32 in total

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 9, 2024
Latest clevis pulls in opensc and pcsc-lite which gives this error on
booting:

```
[    1.931395] dracut-initqueue[621]: pcscd: unrecognized option '--disable-polkit'
[    1.742582] dracut-initqueue[621]: pcscd: unrecognized option '--disable-polkit'
[    1.933525] dracut-initqueue[621]: Usage: pcscd options
[    1.933837] dracut-initqueue[621]: Options:
[[0;32m  OK  [[    1.934124] dracut-initqueue[621]:   -a, --apdu		log APDU commands and results
0m] Found device [0;1;39mAmazon Elastic Block Store root[0m.[    1.934449] dracut-initqueue[621]:   -c, --config		path to reader.conf
[    1.934737] dracut-initqueue[621]:   -f, --foreground	run in foreground (no daemon),

[    1.935028] dracut-initqueue[621]: 			send logs to stdout instead of syslog
[    1.935341] dracut-initqueue[621]:   -T, --color		force use of colored logs
[    1.935628] dracut-initqueue[621]:   -h, --help		display usage information
[    1.935912] dracut-initqueue[621]:   -H, --hotplug		ask the daemon to rescan the available readers
[[0;32m  OK  [0m] Reached target [0;1;39mInit[    1.936468] dracut-initqueue[621]:   -v, --version		display the program version number
rd Root Device[[    1.936748] dracut-initqueue[621]:   -d, --debug		display lower level debug messages
0m.
[    1.937028] dracut-initqueue[621]:   -i, --info		display info level debug messages
[    1.937316] dracut-initqueue[621]:   -e  --error		display error level debug messages (default level)
[    1.937834] dracut-initqueue[621]:   -C  --critical	display critical only level debug messages
[    1.938109] dracut-initqueue[621]:   --force-reader-polling ignore the IFD_GENERATE_HOTPLUG reader capability
[    1.938665] dracut-initqueue[621]:   -t, --max-thread	maximum number of threads (default 200)
[    1.938948] dracut-initqueue[621]:   -s, --max-card-handle-per-thread	maximum number of card handle per thread (default: 200)
[    1.939509] dracut-initqueue[621]:   -r, --max-card-handle-per-reader	maximum number of card handle per reader (default: 200)
[    1.940064] dracut-initqueue[621]:   -x, --auto-exit	pcscd will quit after 60 seconds of inactivity
[    1.940632] dracut-initqueue[621]:   -S, --reader-name-no-serial    do not include the USB serial number in the name
```
This addresses openshift#1630 until https://issues.redhat.com/browse/RHEL-61612 has been fixed.
Copy link
Contributor

@jbtrystram jbtrystram left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

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

openshift-ci bot commented Oct 9, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ausil, jbtrystram, mike-nguyen, Prashanth684

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:
  • OWNERS [jbtrystram,mike-nguyen]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link
Contributor

openshift-ci bot commented Oct 9, 2024

@Prashanth684: all tests passed!

Full PR test history. Your PR dashboard.

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.

@openshift-merge-bot openshift-merge-bot bot merged commit 3953cbb into openshift:master Oct 9, 2024
7 checks passed
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. 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.

5 participants