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

Update Flatcar template #302

Merged
merged 2 commits into from
Mar 20, 2025
Merged

Update Flatcar template #302

merged 2 commits into from
Mar 20, 2025

Conversation

johananl
Copy link
Member

@johananl johananl commented Jan 7, 2025 •
edited
Loading

What this PR does / why we need it: This PR updates the Flatcar template added in #300 to use containerDisks instead of PVCs as well as allow SSH-ing into nodes.

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #311

Special notes for your reviewer: None

Release notes:

Add cluster template for workload clusters running Flatcar Container Linux

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 7, 2025
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jan 7, 2025
@coveralls
Copy link

coveralls commented Jan 7, 2025 •
edited
Loading

Pull Request Test Coverage Report for Build 13972288208

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 58.928%
Totals Coverage Status
Change from base Build 13782530824: 0.0%
Covered Lines: 1561
Relevant Lines: 2649
💛 - Coveralls

@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 8, 2025
@johananl
Copy link
Member Author

johananl commented Jan 9, 2025 •
edited
Loading

  • TODO: Authorize SSH key on nodes.

@johananl johananl force-pushed the flatcar-template branch 2 times, most recently from aaeba7e to cd8bd82 Compare January 9, 2025 13:50
@nunnatsa
Copy link
Contributor

@johananl - is it related to #300 ?

Please check there are no duplication or conflicts.

@nunnatsa
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Jan 21, 2025
@johananl
Copy link
Member Author

johananl commented Jan 21, 2025 •
edited
Loading

@johananl - is it related to #300 ?

Please check there are no duplication or conflicts.

Huh. I was unaware of the other PR 😮

AFAICT they serve the same purpose. The two templates do have some minor differences, the main one being that my template allows SSH-ing into Flatcar nodes whereas the other template doesn't (that's because CAPK's automatic injection of SSH public keys is tailored for cloud-init whereas Flatcar uses Ignition).

I don't have a strong opinion which template to use as long as it works. I based my template on cluster-template-lb.yaml with the only changes being ones required to get things working on Flatcar.

I'm happy to have #300 merged and I can then rebase and add just the SSH part or any other small Flatcar-specific tweaks if that helps.

@nunnatsa nunnatsa mentioned this pull request Jan 21, 2025
Merged
@agradouski
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 4, 2025
@agradouski
Copy link
Contributor

@johananl - agree, this seems like a good course of action. let's have #300 merged first

@agradouski agradouski removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 18, 2025
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 19, 2025
@nunnatsa
Copy link
Contributor

@johananl - #300 was merge. Please rebase

@johananl
Copy link
Member Author

@nunnatsa I rebased locally but am unable to make the new template work (that is - prior to my changes).
I've opened #311 to try and figure this out.

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 20, 2025
@k8s-ci-robot k8s-ci-robot removed the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 20, 2025
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 20, 2025
@johananl johananl changed the title Add template for Flatcar clusters Update Flatcar template Mar 20, 2025
@johananl
Copy link
Member Author

Following this discussion, I've updated the PR to use containerDisks instead of PVCs.

@johananl
Copy link
Member Author

@nunnatsa I think we're ready for another review. Here is what this PR does now:

  1. Use containerDisks instead of PVCs.
  2. Allow SSH-ing into nodes.

🙏

@johananl johananl mentioned this pull request Mar 20, 2025
Closed
@nunnatsa
Copy link
Contributor

@nunnatsa I think we're ready for another review. Here is what this PR does now:

  1. Use containerDisks instead of PVCs.
  2. Allow SSH-ing into nodes.

🙏

Thanks @johananl !

I'm happy to see that the e2e passed.

Could you please run make generate and push the changes?

johananl added 2 commits March 20, 2025 16:50
@johananl
Allow SSH-ing into nodes
a070809 
Signed-off-by: Johanan Liebermann <[email protected]>
@johananl
Use containerDisk instead of PVC
d343184 
Signed-off-by: Johanan Liebermann <[email protected]>
@johananl
Copy link
Member Author

Could you please run make generate and push the changes?

Bah. Forgot that I added another comment to the template. Done 👍

nunnatsa
nunnatsa approved these changes Mar 20, 2025
View reviewed changes
Copy link
Contributor

@nunnatsa nunnatsa left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 20, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: johananl, nunnatsa

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 20, 2025
@k8s-ci-robot k8s-ci-robot merged commit 1db32ff into kubernetes-sigs:main Mar 20, 2025
13 of 14 checks passed
@johananl johananl deleted the flatcar-template branch March 21, 2025 14:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nunnatsa nunnatsa nunnatsa approved these changes

@agradouski agradouski Awaiting requested review from agradouski

@qinqon qinqon Awaiting requested review from qinqon

Assignees

@nunnatsa nunnatsa

@agradouski agradouski

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Can't specify VM image in Flatcar template
5 participants
@johananl @coveralls @nunnatsa @agradouski @k8s-ci-robot