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.

Sign up for GitHub

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

Jump to bottom

Remove hard dependency on torcx, removed in Flatcar 3815.2.0 #357

Merged
merged 1 commit into from
Feb 15, 2024
Merged

Remove hard dependency on torcx, removed in Flatcar 3815.2.0 #357

merged 1 commit into from
Feb 15, 2024

Conversation

embik
Copy link
Member

@embik embik commented Feb 15, 2024

What this PR does / why we need it:
We ran into the issue described in #335 - Flatcar's release of 3815.2.0 broke our OSP because we depend on torcx being available. It has been removed in this Flatcar version though.

This PR is an attempt at making the least amount of changes to the systemd drop-in we use while maximising compatibility with old Flatcar images - If torcx is still there because you are running a very old version of Flatcar, this will keep using it by giving priority to the TORCX_BINDIR sourced from /run/metadata/torcx, but since we are making sourcing environment variables from that file optional (with the - prefix), it might be very well empty (which is the case for newer Flatcar versions).

Which issue(s) this PR fixes:

Fixes #335

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

@embik
Remove hard dependency on torcx, removed in Flatcar 3815.2.0
c7a973c 
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. docs/none Denotes a PR that doesn't need documentation (changes). dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. sig/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. 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

/hold

I'm doing some manual testing on older flatcar versions to ensure this change is compatible.

@kubermatic-bot kubermatic-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 15, 2024
@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: f0680437f5bf0f5c4c1acf5c05ef1f3ec76dc852

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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
@embik embik mentioned this pull request Feb 15, 2024
Closed
@embik
Copy link
Member Author

embik commented Feb 15, 2024

/cherry-pick release/v1.4

@kubermatic-bot
Copy link
Contributor

@embik: once the present PR merges, I will cherry-pick it on top of release/v1.4 in a new PR and assign it to you.

In response to this:

/cherry-pick release/v1.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@embik
Copy link
Member Author

embik commented Feb 15, 2024

/cherry-pick release/v1.3

@kubermatic-bot
Copy link
Contributor

@embik: once the present PR merges, I will cherry-pick it on top of release/v1.3 in a new PR and assign it to you.

In response to this:

/cherry-pick release/v1.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@embik
Copy link
Member Author

embik commented Feb 15, 2024

/cherry-pick release/v1.2

@kubermatic-bot
Copy link
Contributor

@embik: once the present PR merges, I will cherry-pick it on top of release/v1.2 in a new PR and assign it to you.

In response to this:

/cherry-pick release/v1.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@embik
Copy link
Member Author

embik commented Feb 15, 2024 •
edited

/hold cancel

Everything looking good. Tested this with 3374.2.2 and 3815.2.0.

@kubermatic-bot kubermatic-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 15, 2024
@kubermatic-bot kubermatic-bot merged commit d16de93 into kubermatic:main Feb 15, 2024
11 checks passed
@kubermatic-bot
Copy link
Contributor

@embik: #357 failed to apply on top of branch "release/v1.4":

Applying: Remove hard dependency on torcx, removed in Flatcar 3815.2.0
Using index info to reconstruct a base tree...
M	deploy/osps/default/osp-flatcar-cloud-init.yaml
M	deploy/osps/default/osp-flatcar.yaml
M	pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml
M	pkg/controllers/osc/testdata/secret-flatcar-aws-containerd-provisioning.yaml
Falling back to patching base and 3-way merge...
Auto-merging pkg/controllers/osc/testdata/secret-flatcar-aws-containerd-provisioning.yaml
CONFLICT (content): Merge conflict in pkg/controllers/osc/testdata/secret-flatcar-aws-containerd-provisioning.yaml
Auto-merging pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml
Auto-merging deploy/osps/default/osp-flatcar.yaml
Auto-merging deploy/osps/default/osp-flatcar-cloud-init.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Remove hard dependency on torcx, removed in Flatcar 3815.2.0
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release/v1.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@embik embik deleted the torcx-backwards-compat-change branch February 15, 2024 11:04
@kubermatic-bot
Copy link
Contributor

@embik: #357 failed to apply on top of branch "release/v1.3":

Applying: Remove hard dependency on torcx, removed in Flatcar 3815.2.0
Using index info to reconstruct a base tree...
M	deploy/osps/default/osp-flatcar-cloud-init.yaml
M	deploy/osps/default/osp-flatcar.yaml
M	pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml
M	pkg/controllers/osc/testdata/secret-flatcar-aws-containerd-provisioning.yaml
Falling back to patching base and 3-way merge...
Auto-merging pkg/controllers/osc/testdata/secret-flatcar-aws-containerd-provisioning.yaml
CONFLICT (content): Merge conflict in pkg/controllers/osc/testdata/secret-flatcar-aws-containerd-provisioning.yaml
Auto-merging pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml
Auto-merging deploy/osps/default/osp-flatcar.yaml
Auto-merging deploy/osps/default/osp-flatcar-cloud-init.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Remove hard dependency on torcx, removed in Flatcar 3815.2.0
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release/v1.3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@kubermatic-bot
Copy link
Contributor

@embik: #357 failed to apply on top of branch "release/v1.2":

Applying: Remove hard dependency on torcx, removed in Flatcar 3815.2.0
Using index info to reconstruct a base tree...
A	deploy/osps/default/osp-flatcar-cloud-init.yaml
M	deploy/osps/default/osp-flatcar.yaml
M	pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml
M	pkg/controllers/osc/testdata/secret-flatcar-aws-containerd-provisioning.yaml
Falling back to patching base and 3-way merge...
Auto-merging pkg/controllers/osc/testdata/secret-flatcar-aws-containerd-provisioning.yaml
CONFLICT (content): Merge conflict in pkg/controllers/osc/testdata/secret-flatcar-aws-containerd-provisioning.yaml
Auto-merging pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml
Auto-merging deploy/osps/default/osp-flatcar.yaml
Auto-merging deploy/osps/default/osp-amzn2.yaml
CONFLICT (content): Merge conflict in deploy/osps/default/osp-amzn2.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Remove hard dependency on torcx, removed in Flatcar 3815.2.0
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release/v1.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

embik added a commit to embik/operating-system-manager that referenced this pull request Feb 15, 2024
@embik
[release/v1.4] Remove hard dependency on torcx, removed in Flatcar 38…
fb76e80 
…15.2.0 (kubermatic#357)

Signed-off-by: Marvin Beckers <marvin@kubermatic.com>
This was referenced Feb 15, 2024
Merged
Merged
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@kron4eg kron4eg

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. docs/none Denotes a PR that doesn't need documentation (changes). 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/cluster-management Denotes a PR or issue as being assigned to SIG Cluster Management. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Migrate away from torcx in Flatcar
3 participants
@embik @kron4eg @kubermatic-bot