Skip to content

kicbase: fix deterministic machine-id breaking MAC addresses in multi-node Podman rootless clusters #22823

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

Open
RobinMcCorkell wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −9
Open

kicbase: fix deterministic machine-id breaking MAC addresses in multi-node Podman rootless clusters #22823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions deploy/kicbase/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,12 @@ RUN rm -rf \
/usr/share/doc/* \
/usr/share/man/* \
/usr/share/local/*

# Per https://systemd.io/CONTAINER_INTERFACE/, /etc/machine-id must be present
# but empty in a container image so it is freshly initialized on each boot.
# Remove /var/lib/dbus/machine-id so that systemd-machine-id-setup cannot fall
# back to a baked-in value, which would make every container share the same ID.
RUN truncate -s 0 /etc/machine-id && rm -f /var/lib/dbus/machine-id
RUN echo "kic! Build: ${COMMIT_SHA} Time :$(date)" > "/kic.txt"

# squash all layers into one
Expand Down
9 changes: 0 additions & 9 deletions deploy/kicbase/entrypoint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,14 +357,6 @@ retryable_fix_cgroup() {
exit 31
}

fix_machine_id() {
# Deletes the machine-id embedded in the node image and generates a new one.
# This is necessary because both kubelet and other components like weave net
# use machine-id internally to distinguish nodes.
echo 'INFO: clearing and regenerating /etc/machine-id' >&2
rm -f /etc/machine-id
systemd-machine-id-setup
}

fix_product_name() {
# this is a small fix to hide the underlying hardware and fix issue #426
Expand Down Expand Up @@ -545,7 +537,6 @@ configure_containerd
configure_proxy
fix_mount
retryable_fix_cgroup
fix_machine_id
fix_product_name
fix_product_uuid
select_iptables
Expand Down