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

[release/v1.7] Fix Flatcar torcx issues #3041

Merged
merged 3 commits into from Feb 15, 2024

Conversation

kron4eg
Copy link
Member

@kron4eg kron4eg commented Feb 15, 2024

What this PR does / why we need it:
This is a manual cherry-pick of the #3040 and #3043
Plus OSM version update

What type of PR is this?
/kind regression

Special notes for your reviewer:

Does this PR introduce a user-facing change? Then add your Release Note here:

Fix Flatcar torcx issues

Documentation:

NONE

* Use containerd binary from path, as flat removed torcx in their newest release and the binary path has changed

Signed-off-by: Kai Fink <kai.fink@yahoo.de>

* Updated fixtures

Signed-off-by: Kai Fink <kai.fink@yahoo.de>

* Secured more backwards compatibility and updated fixtures

Signed-off-by: Kai Fink <kai.fink@yahoo.de>

---------

Signed-off-by: Kai Fink <kai.fink@yahoo.de>
@kubermatic-bot kubermatic-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/regression Categorizes issue or PR as related to a regression from a prior release. do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. labels Feb 15, 2024
@kubermatic-bot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@kron4eg kron4eg marked this pull request as ready for review February 15, 2024 12:21
@kubermatic-bot kubermatic-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Feb 15, 2024
Copy link
Member

@embik embik left a comment

Choose a reason for hiding this comment

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

/approve

although I don't think the [release] prefix needs to be in the release notes.

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 15, 2024
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 4f375c35a4dfd132a953ccc88518d38a6a1a716a

@kron4eg
Copy link
Member Author

kron4eg commented Feb 15, 2024

/retest

@kron4eg kron4eg marked this pull request as draft February 15, 2024 13:38
@kubermatic-bot kubermatic-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 15, 2024
Signed-off-by: Artiom Diomin <artiom@kubermatic.com>
@kubermatic-bot kubermatic-bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 15, 2024
Copy link
Member

@ahmedwaleedmalik ahmedwaleedmalik left a comment

Choose a reason for hiding this comment

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

/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 15, 2024
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 6e686b9aa132ebd6563cf992feb8d545ee5aab2c

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahmedwaleedmalik, embik

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

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 15, 2024
Signed-off-by: Artiom Diomin <artiom@kubermatic.com>
@kubermatic-bot kubermatic-bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 15, 2024
@kron4eg kron4eg changed the title [release/v1.7] Fix: Use containerd binary from path in Flatcar [release/v1.7] Fix Flatcar torcx issues Feb 15, 2024
@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Feb 15, 2024
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 6c0ef75739b7d3c439e9d9be3e1f41a17f819da3

@kron4eg kron4eg marked this pull request as ready for review February 15, 2024 15:59
@kubermatic-bot kubermatic-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 15, 2024
@kron4eg
Copy link
Member Author

kron4eg commented Feb 15, 2024

/test pull-kubeone-e2e-aws-flatcar-install-containerd-external-v1.27.3

@kron4eg
Copy link
Member Author

kron4eg commented Feb 15, 2024

cc @kubermatic/sig-release-managers

@embik embik added the cherry-pick-approved Indicates a PR has been approved by release managers. label Feb 15, 2024
@kubermatic-bot kubermatic-bot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Feb 15, 2024
@kubermatic-bot kubermatic-bot merged commit 02dd723 into kubermatic:release/v1.7 Feb 15, 2024
14 checks passed
@kron4eg kron4eg deleted the release/v1.7 branch February 15, 2024 17:21
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. cherry-pick-approved Indicates a PR has been approved by release managers. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. kind/regression Categorizes issue or PR as related to a regression from a prior release. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants