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

Support flatcar version >= 3815.2.0 #93

Merged

Conversation

MichaelEischer
Copy link
Contributor

@MichaelEischer MichaelEischer commented Mar 4, 2024

How to categorize this PR?

/area os
/kind enhancement

What this PR does / why we need it:

Flatcar starting from version 3815.2.0 has removed torcx support and replaced it with systemd-sysext. The main difference form a user perspective is that the containerd binaries have moved from /run/torcx/unpack/docker/bin to /usr/bin .

This PR updates the extension to (still) prefer binaries in /run/torcx/unpack/docker/bin but to also fall back to /usr/bin if the former don't exit. This allows using both Flatcar versions that still use torcx and those that only use systemd-sysext.

Which issue(s) this PR fixes:

Special notes for your reviewer:

I've manually tested the change with flatcar 3760.2.0 and 3815.2.0. (although still using Gardener 1.79)

Release note:

The extension now supports Flatcar >= 3815.2.0

@MichaelEischer MichaelEischer requested review from a team as code owners March 4, 2024 09:36
@gardener-robot gardener-robot added area/os Operation system related kind/enhancement Enhancement, improvement, extension labels Mar 4, 2024
@gardener-robot
Copy link

@MichaelEischer Thank you for your contribution.

@gardener-robot gardener-robot added needs/review Needs review size/s Size of pull request is small (see gardener-robot robot/bots/size.py) labels Mar 4, 2024
@gardener-robot-ci-1
Copy link
Contributor

Thank you @MichaelEischer for your contribution. Before I can start building your PR, a member of the organization must set the required label(s) {'reviewed/ok-to-test'}. Once started, you can check the build status in the PR checks section below.

@robinschneider
Copy link

robinschneider commented Mar 6, 2024

@vpnachev @rfranzke Could you have a look at it?

@MrBatschner
Copy link
Contributor

/add reviewed/ok-to-test

@gardener-robot gardener-robot added the reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) label Mar 7, 2024
@gardener-robot-ci-3 gardener-robot-ci-3 added needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Mar 7, 2024
Copy link
Contributor

@plkokanov plkokanov left a comment

Choose a reason for hiding this comment

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

Thanks for the PR, just a minor suggestion on my side.
You cold also include in the TODO comments which is the last version of flatcar that ships with torcx.

pkg/controller/operatingsystemconfig/actuator.go Outdated Show resolved Hide resolved
@MichaelEischer
Copy link
Contributor Author

@plkokanov I've updated the TODO comments as suggested

Copy link
Contributor

@plkokanov plkokanov left a comment

Choose a reason for hiding this comment

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

/lgtm

@gardener-robot gardener-robot added reviewed/lgtm Has approval for merging and removed needs/review Needs review labels Mar 20, 2024
@gardener-robot-ci-1 gardener-robot-ci-1 added reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) and removed reviewed/ok-to-test Has approval for testing (check PR in detail before setting this label because PR is run on CI/CD) labels Mar 20, 2024
@MichaelEischer
Copy link
Contributor Author

/approve

@gardener-robot
Copy link

@MichaelEischer Command /approve is not known.

@MichaelEischer
Copy link
Contributor Author

@plkokanov Is there anything left to do here to get this PR merged?

@robinschneider
Copy link

@plkokanov Is there anything left to do here to get this PR merged?

Would be great to get this merged and released.

@plkokanov
Copy link
Contributor

@plkokanov Is there anything left to do here to get this PR merged?
Would be great to get this merged and released.

/cc @danielfoehrKn @marwinski if they would also like to have a look

Copy link
Member

@timebertt timebertt left a comment

Choose a reason for hiding this comment

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

Looks great, thanks!
/lgtm

I suggest merging this by tomorrow if there is no additional feedback.

@gardener-robot
Copy link

@timebertt Command /lgtm is not available to you but only to a Maintainer, Member.

@timebertt timebertt merged commit 37886e3 into gardener:master Mar 27, 2024
5 checks passed
@timebertt timebertt deleted the feature/fix-flatcar-with-sysext branch March 27, 2024 13:53
@gardener-robot gardener-robot added the status/closed Issue is closed (either delivered or triaged) label Mar 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/os Operation system related kind/enhancement Enhancement, improvement, extension needs/ok-to-test Needs approval for testing (check PR in detail before setting this label because PR is run on CI/CD) reviewed/lgtm Has approval for merging size/s Size of pull request is small (see gardener-robot robot/bots/size.py) status/closed Issue is closed (either delivered or triaged)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants