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

update to systemd 246 and dbus-broker 24 #1176

Merged
merged 3 commits into from
Oct 22, 2020

Conversation

bcressey
Copy link
Contributor

@bcressey bcressey commented Oct 21, 2020

Issue number:
Fixes #1015, fixes #1175

Description of changes:
Update systemd and dbus-broker to the latest release.

Work around a behavior change in systemd-notify that caused an SELinux denial when starting apiserver.

Testing done:
Launched x86_64 and aarch64 nodes. Confirmed that the nodes joined the cluster, ran pods OK.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

@bcressey bcressey requested review from tjkirch and webern October 21, 2020 22:09
packages/dbus-broker/Cargo.toml Outdated Show resolved Hide resolved
sources/api/apiserver/src/server/mod.rs Show resolved Hide resolved
Drop the libcap dependency, since it's only used if we enable audit
support, and the audit support actually requires libcap-ng instead.

Signed-off-by: Ben Cressey <bcressey@amazon.com>
Signed-off-by: Ben Cressey <bcressey@amazon.com>
In v246, systemd added an sd_notify_barrier function to avoid a race
when the notification is sent by a different process than the one it
spawned. The barrier works by sharing a file descriptor between the
process and systemd.

That doesn't apply to our use case, and the shared file descriptor
complicates the SELinux policy, since systemd would need to write to
a file owned by apiserver.

Work around this by passing the new `--no-block` argument to the
`systemd-notify` command.

Signed-off-by: Ben Cressey <bcressey@amazon.com>
@bcressey bcressey merged commit 128a9df into bottlerocket-os:develop Oct 22, 2020
@bcressey bcressey deleted the systemd-update branch October 22, 2020 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

update to dbus-broker 24 Update to systemd 246
3 participants