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

Fully drop elemental from kairos #1441

Merged
merged 2 commits into from
May 25, 2023
Merged

Fully drop elemental from kairos #1441

merged 2 commits into from
May 25, 2023

Conversation

Itxaka
Copy link
Member

@Itxaka Itxaka commented May 22, 2023

What this PR does / why we need it:

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

@Itxaka Itxaka force-pushed the v2 branch 2 times, most recently from 9d67b13 to 9344731 Compare May 22, 2023 18:32
@Itxaka Itxaka linked an issue May 23, 2023 that may be closed by this pull request
@Itxaka Itxaka force-pushed the v2 branch 11 times, most recently from 905cd54 to f4bb840 Compare May 25, 2023 07:55
includes:

 - remove machine-id fully on openrc systems
 - fix alpine services sharing the same pid for kairos and webui
 - convert kairos openrc service into a one shot, as its not a daemon
 - bump peg
 - enable more debugging for tests, including getting the serial on
   failure
 - enable immucore.debug on tests
 - smaller fixes for yip files

Signed-off-by: Itxaka <[email protected]>
@Itxaka Itxaka changed the title Remove machine-id fully Fully drop elemental from kairos May 25, 2023
start() {
kairos-agent start
eend $?
Copy link
Member Author

Choose a reason for hiding this comment

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

not a type, I assure you :D

@@ -5,24 +5,27 @@ stages:
if: '[ ! -f /oem/userdata ]'
name: "Pull data from provider"
datasource:
providers: ["cdrom", "gcp", "openstack", "aws", "azure", "hetzner", "packet", "scaleway", "vultr", "digitalocean", "metaldata"]
providers: ["cdrom", "gcp", "openstack", "aws", "azure", "hetzner", "packet", "vultr", "digitalocean", "metaldata"]
Copy link
Member Author

Choose a reason for hiding this comment

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

scaleway has no timeout out of the box so it can take up to 60 seconds to timeout if there is network during initramfs. Patch upstream to fix this has been sent and merged, waiting for it to trickle down.

files:
- path: /run/.userdata_load
initramfs.before:
- <<: *datasource
- if: '[ ! -f /oem/userdata ]'
files:
- path: /oem/.userdata_load
- path: /run/.userdata_load
Copy link
Member Author

Choose a reason for hiding this comment

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

leftover was breaking alpine

@@ -1,11 +1,11 @@
name: "Start agent"
stages:
boot:
- if: '[ ! -f "/run/cos/recovery_mode" ]'
- if: '[ ! -f "/run/cos/recovery_mode" ] && [ -d "/usr/share/systemd" ]'
Copy link
Member Author

Choose a reason for hiding this comment

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

avoid running it on openrc systems. We need a better way to check this, probably via the kairos-agent state get init or something similar

@@ -33,6 +33,7 @@ stages:
/var/lib/wicked
/var/lib/longhorn
/var/lib/cni
/var/lib/dbus
Copy link
Member Author

Choose a reason for hiding this comment

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

alpine stores the machine-id here so it needs to be persistent

@Itxaka Itxaka requested a review from a team May 25, 2023 10:12
@Itxaka Itxaka marked this pull request as ready for review May 25, 2023 10:12
@@ -2,6 +2,7 @@ ARG BASE_IMAGE=opensuse/tumbleweed

FROM $BASE_IMAGE

RUN zypper removerepo repo-openh264
Copy link
Member

Choose a reason for hiding this comment

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

nice finding

Copy link
Member

@mauromorales mauromorales left a comment

Choose a reason for hiding this comment

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

lgtm

@Itxaka Itxaka merged commit 22d7a41 into kairos-io:master May 25, 2023
@Itxaka Itxaka deleted the v2 branch May 25, 2023 13:25
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.

remove all references to elemental-cli from docs/code/everywhere
2 participants