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.4] Remove hard dependency on torcx, removed in Flatcar 3815.2.0 #358

Merged

Conversation

embik
Copy link
Member

@embik embik commented Feb 15, 2024

What this PR does / why we need it:
Manual cherry-pick of #357.

Which issue(s) this PR fixes:

Fixes #

What type of PR is this?
/kind bug

Special notes for your reviewer:

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

Fix containerd configuration for Flatcar nodes on stable 3815.2.0 or higher

Documentation:

NONE

…15.2.0

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>
@kubermatic-bot kubermatic-bot added kind/bug Categorizes issue or PR as related to a bug. release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. sig/osm Denotes a PR or issue as being assigned to SIG OSM. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 15, 2024
@embik
Copy link
Member Author

embik commented Feb 15, 2024

/cc @ahmedwaleedmalik @kron4eg

@kron4eg
Copy link
Member

kron4eg commented Feb 15, 2024

/lgtm
/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: b284bcebff106154db48360672fee4a396cf94f4

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
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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
@kubermatic-bot kubermatic-bot merged commit 9110e7d into kubermatic:release/v1.4 Feb 15, 2024
10 of 11 checks passed
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. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. kind/bug Categorizes issue or PR as related to a bug. 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. sig/osm Denotes a PR or issue as being assigned to SIG OSM. 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

4 participants