Skip to content

[GEP-28] gardenadm bootstrap: Connect to first control plane machine and copy manifests #12686

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
Merged
merged 12 commits into from
Aug 20, 2025
Merged

[GEP-28] gardenadm bootstrap: Connect to first control plane machine and copy manifests #12686

merged 12 commits into from
Aug 20, 2025

Conversation

timebertt
Copy link
Member

How to categorize this PR?

/area ipcei
/kind enhancement

What this PR does / why we need it:

This PR continues the implementation of the gardenadm bootstrap flow.
After deploying Worker and Bastion, gardenadm connects to the first control plane machine using SSH via the Bastion.
Then, after connecting and compiling the ShootState (#12669), gardenadm copies all manifests in --config-dir, the ShootState, and the image vector overwrite file via SCP to the control plane machine.

With this, the machine is prepared so that we can run gardenadm init to bootstrap the control plane.

Which issue(s) this PR fixes:
Part of #2906

Special notes for your reviewer:

/cc @rfranzke @ScheererJ @maboehm

Release note:

NONE

@gardener-prow gardener-prow bot requested a review from rfranzke August 6, 2025 13:50
@gardener-prow gardener-prow bot added the area/ipcei IPCEI (Important Project of Common European Interest) label Aug 6, 2025
@gardener-prow gardener-prow bot requested a review from ScheererJ August 6, 2025 13:50
@gardener-prow gardener-prow bot added the kind/enhancement Enhancement, improvement, extension label Aug 6, 2025
@gardener-prow Gardener Prow
Copy link
Contributor

gardener-prow bot commented Aug 6, 2025

@timebertt: GitHub didn't allow me to request PR reviews from the following users: maboehm.

Note that only gardener members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

How to categorize this PR?

/area ipcei
/kind enhancement

What this PR does / why we need it:

This PR continues the implementation of the gardenadm bootstrap flow.
After deploying Worker and Bastion, gardenadm connects to the first control plane machine using SSH via the Bastion.
Then, after connecting and compiling the ShootState (#12669), gardenadm copies all manifests in --config-dir, the ShootState, and the image vector overwrite file via SCP to the control plane machine.

With this, the machine is prepared so that we can run gardenadm init to bootstrap the control plane.

Which issue(s) this PR fixes:
Part of #2906

Special notes for your reviewer:

/cc @rfranzke @ScheererJ @maboehm

Release note:

NONE

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-sigs/prow repository.

@gardener-prow gardener-prow bot added cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 6, 2025
@timebertt timebertt mentioned this pull request Aug 6, 2025
Open
@timebertt timebertt force-pushed the gardenadm-bootstrap-copy-manifests branch from 28c4395 to 341127a Compare August 6, 2025 20:05
rfranzke
rfranzke reviewed Aug 7, 2025
View reviewed changes
Copy link
Member

@rfranzke rfranzke left a comment

Choose a reason for hiding this comment

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

Very nice PR :) Well done!

timebertt added 11 commits August 19, 2025 08:46
@timebertt
Cleanup: move Bastion task down
39e7494 
Should be a bit easier to follow as the previous tasks are not related to the `Bastion`, but the next tasks will be.
@timebertt
Fix machine hostname resolution for gardenadm bootstrap
13fdde6
@timebertt
Fix Infrastructure migration for gardenadm bootstrap
66819e2
@timebertt
ssh.Connection: add optional OutputPrefix
0f535ac
@timebertt
ssh.Connection: add SCP client
f9224d9
@timebertt
Connect to first control plane machine
abebc18
@timebertt
Prefactor: extract resources.VisitManifestFiles
d028a4f 
This allows reusing our logic for selecting manifest files (file extension, ignore hidden files, etc.) when copying them to the control plane machines.
@timebertt
Copy manifests to first control plane machine
de09ab6
@timebertt
Fix copyright/license of copied file
968d0c0
@timebertt
Consistently avoid filepath.Join in gardenadm bootstrap
248dac4
@timebertt
Feedback, typos, linter issues
c7fdad7
@timebertt
Copy link
Member Author

@rfranzke I addressed your feedback, PTAL :)

@timebertt timebertt force-pushed the gardenadm-bootstrap-copy-manifests branch from 341127a to c7fdad7 Compare August 19, 2025 08:01
rfranzke
rfranzke reviewed Aug 20, 2025
View reviewed changes
Copy link
Member

@rfranzke rfranzke left a comment

Choose a reason for hiding this comment

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

Thanks! :)

/lgtm
/approve

@gardener-prow gardener-prow bot added the lgtm Indicates that a PR is ready to be merged. label Aug 20, 2025
@gardener-prow Gardener Prow
Copy link
Contributor

gardener-prow bot commented Aug 20, 2025

LGTM label has been added.

Git tree hash: 26725afc23afb0408b9c86c47a6eaa551eb0e4cf

@gardener-prow Gardener Prow
Copy link
Contributor

gardener-prow bot commented Aug 20, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rfranzke

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

@gardener-prow gardener-prow bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 20, 2025
@gardener-prow gardener-prow bot merged commit 6404db1 into gardener:master Aug 20, 2025
19 checks passed
@timebertt timebertt deleted the gardenadm-bootstrap-copy-manifests branch August 20, 2025 11:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rfranzke rfranzke rfranzke left review comments

@ScheererJ ScheererJ Awaiting requested review from ScheererJ

Assignees

@rfranzke rfranzke

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/ipcei IPCEI (Important Project of Common European Interest) cla: yes Indicates the PR's author has signed the cla-assistant.io CLA. kind/enhancement Enhancement, improvement, extension lgtm Indicates that a PR is ready to be merged. 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.
2 participants
@timebertt @rfranzke