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

qemu,raw: Mask sshd during bootstrap #893

Merged

Conversation

johananl
Copy link
Member

What this PR does / why we need it:
This is a fix to a race in the Flatcar installation process on the QEMU and raw targets.

Which issue(s) this PR fixes (optional, in fixes #(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged): Fixes #892

Additional context
To test this PR, ensure the following build succeeds:

FLATCAR_VERSION=3139.2.1 make build-qemu-flatcar

Flatcar ships with sshd enabled by default. Installing Flatcar
entails booting into Flatcar from an ISO and running the installation
command. Packer treats the availability of the SSH port as an
indication that the OS installation is done. To address this, a
static wait time is appended to the Flatcar boot command, which means
there is a potential race between the installation script and Packer.
This leads to occasional Packer errors in Flatcar builds.

Mask sshd during bootstrap. When the installation completes, the VM
is rebooted from disk and then sshd is enabled again automatically.
Also remove the wait as it's no longer necessary because we can rely
on the built-in ssh_timeout Packer parameter like other distros do.

Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com>
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 16, 2022
@codenrhoden
Copy link
Contributor

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 17, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: codenrhoden, johananl

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 17, 2022
@k8s-ci-robot k8s-ci-robot merged commit ddd0f29 into kubernetes-sigs:master May 17, 2022
@johananl johananl deleted the johananl/flatcar-mask-sshd branch May 18, 2022 09:14
johananl added a commit to kinvolk/image-builder that referenced this pull request May 26, 2022
This is a similar change to kubernetes-sigs#893 - see this PR for more info.

Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com>
johananl added a commit to kinvolk/image-builder that referenced this pull request Jul 7, 2022
This is a similar change to kubernetes-sigs#893 - see this PR for more info.

Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com>
johananl added a commit to kinvolk/image-builder that referenced this pull request Jul 8, 2022
This is a similar change to kubernetes-sigs#893 - see this PR for more info.

Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com>
johananl added a commit to kinvolk/image-builder that referenced this pull request Jul 14, 2022
This is a similar change to kubernetes-sigs#893 - see this PR for more info.

Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com>
johananl added a commit to kinvolk/image-builder that referenced this pull request Jul 28, 2022
This is a similar change to kubernetes-sigs#893 - see this PR for more info.

Signed-off-by: Johanan Liebermann <jliebermann@microsoft.com>
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

qemu,raw: Race between Flatcar installation and Packer
3 participants