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

Bump and adapt to new kairos-init #3214

Merged
merged 7 commits into from
Feb 22, 2025
Merged

Bump and adapt to new kairos-init #3214

merged 7 commits into from
Feb 22, 2025

Conversation

Itxaka
Copy link
Member

@Itxaka Itxaka commented Feb 21, 2025

  • fixes some issues with alpine
  • brings missing logrotate
  • installs expected utils in standard
  • now requires a version to be passes to set the output version of the artifacts

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 #

- fixes some issues with alpine
- brings missing logrotate
- installs expected utils in standard
- now requires a version to be passes to set the output version of the
  artifacts

Signed-off-by: Itxaka <itxaka@kairos.io>
Signed-off-by: Itxaka <itxaka@kairos.io>
Signed-off-by: Itxaka <itxaka@kairos.io>
Why would we check if there is a v in the version name? How does that
checks if the upgrade went ok??

Signed-off-by: Itxaka <itxaka@kairos.io>
@jimmykarily
Copy link
Contributor

fixes some issues with alpine -> what issue was that?

FROM base-kairos AS kairos-standard
COPY --from=framework /usr/bin/luet /usr/bin/luet
COPY --from=framework /etc/luet/luet.yaml /etc/luet/luet.yaml
RUN luet install -y utils/edgevpn utils/k9s utils/nerdctl container/kubectl utils/kube-vip
Copy link
Contributor

Choose a reason for hiding this comment

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

is this happening on kairos-init now?

Copy link
Member Author

Choose a reason for hiding this comment

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

yep!

Copy link
Member Author

Choose a reason for hiding this comment

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

v, _ = vm.Sudo(getVersionCmd)
return v
// TODO: Add regex semver check here
}, 10*time.Minute, 10*time.Second).Should(ContainSubstring("v"), v)
Copy link
Contributor

Choose a reason for hiding this comment

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

This check seemed intentional. What changed?

Copy link
Member Author

Choose a reason for hiding this comment

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

freeform semver for now.

Still this check is useless. Checking that the version just contains a v its absurd? Even if the upgrade didnt pass, this check would pass so I dont see how this is a useful check at all.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think we added that because we had a bug with a missing v . This covers it enough :D.

@Itxaka
Copy link
Member Author

Itxaka commented Feb 22, 2025

fixes some issues with alpine -> what issue was that?

It's actually an issue with future alpine versions, as they removed /var/lock and linked it to /run/lock which breaks the locking mechanism of yip on user creation

@Itxaka Itxaka merged commit ad983b4 into master Feb 22, 2025
50 of 51 checks passed
@Itxaka Itxaka deleted the bump_init branch February 22, 2025 22:26
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.

3 participants