[GEP-28] `gardenadm bootstrap`: return `Machine` addresses in provider-local #12489

maboehm · 2025-07-09T08:22:58Z

How to categorize this PR?
/area ipcei
/kind enhancement

What this PR does / why we need it:
This PR builds on #12307 and demonstrates what gardener/machine-controller-manager#1012 looks like in practice. The MCM interaction with the target cluster is disabled, and therefore a new status field is returned:

status:
  addresses:
  - address: machine-shoot--garden--root-control-plane-695dc-tr9jl
    type: Hostname
  - address: 10.1.130.204
    type: InternalIP

The relevant changes are in the last commit: 6b3ba18

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

Special notes for your reviewer:
In draft until the following PRs are merged:

Release note:

gardener-prow · 2025-07-09T08:23:02Z

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

pkg/provider-local/machine-provider/local/create_machine.go

timebertt

Nice, lgtm

pkg/provider-local/machine-provider/local/driver.go

gardener-ci-robot · 2025-07-26T10:48:52Z

The Gardener project currently lacks enough active contributors to adequately respond to all PRs.
This bot triages PRs according to the following rules:

After 15d of inactivity, lifecycle/stale is applied
After 15d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
After 7d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

Mark this PR as fresh with /remove-lifecycle stale
Mark this PR as rotten with /lifecycle rotten
Close this PR with /close

/lifecycle stale

timebertt · 2025-07-28T14:24:32Z

/remove-lifecycle stale

gardener-ci-robot · 2025-08-12T15:41:01Z

The Gardener project currently lacks enough active contributors to adequately respond to all PRs.
This bot triages PRs according to the following rules:

After 15d of inactivity, lifecycle/stale is applied
After 15d of inactivity since lifecycle/stale was applied, lifecycle/rotten is applied
After 7d of inactivity since lifecycle/rotten was applied, the PR is closed

You can:

Mark this PR as fresh with /remove-lifecycle stale
Mark this PR as rotten with /lifecycle rotten
Close this PR with /close

/lifecycle stale

maboehm · 2025-08-13T06:57:43Z

/remove-lifecycle stale
still waiting for the upstream PR to be merged. It is approved and I guess waiting for another opinion

timebertt

Thanks!
/lgtm

Do you want to address the TODOs in

gardener/pkg/gardenadm/botanist/ssh.go

Lines 62 to 75 in 3bcd2bf

    
           // For now, we expect that the Bastion can connect to the control plane machine via its hostname and that the hostname 
        
           // is equal to the machine's name. 
        
           // More cases will be supported once https://github.com/gardener/machine-controller-manager/pull/1012 gets released. 
        
           // TODO(timebertt): prefer Machine.status.addresses if present once mcm has been updated in gardener 
        
           machineHostname := machine.Name 
        
           // Until machine-controller-manager-provider-local reports the correct hostname/IP in Machine.status.addresses, we 
        
           // prefix the machine name with "machine-" because we know that this is the hostname of local machines. 
        
           // TODO(timebertt): drop this shortcut once https://github.com/gardener/gardener/pull/12489 has been merged. 
        
           if b.Shoot.GetInfo().Spec.Provider.Type == "local" { 
        
           	machineHostname = "machine-" + machineHostname 
        
           } 
        
           return net.JoinHostPort(machineHostname, "22")

as well? (could be a separate PR)

gardener-prow · 2025-09-02T12:33:04Z

LGTM label has been added.

Git tree hash: 0bc193984ba0715c6d472e97bedf123b0767b4c9

gardener-prow · 2025-09-03T12:34:29Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from timebertt. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

pkg/gardenadm/botanist/ssh.go

timebertt

Thanks!
/lgtm

gardener-prow · 2025-09-03T14:34:38Z

LGTM label has been added.

Git tree hash: 3f1ce3cc7a99796eef7e47a9cebdd0afd19284d2

gardener-prow bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. area/ipcei IPCEI (Important Project of Common European Interest) kind/enhancement Enhancement, improvement, extension labels Jul 9, 2025

gardener-prow bot requested review from dimitar-kostadinov and oliver-goetz July 9, 2025 08:23

maboehm mentioned this pull request Jul 9, 2025

[GEP-28] Report Machine.status.addresses when running without target cluster gardener/machine-controller-manager#1012

Merged

timebertt reviewed Jul 9, 2025

View reviewed changes

pkg/provider-local/machine-provider/local/create_machine.go Outdated Show resolved Hide resolved

timebertt reviewed Jul 9, 2025

View reviewed changes

rfranzke reviewed Jul 11, 2025

View reviewed changes

pkg/provider-local/machine-provider/local/driver.go Outdated Show resolved Hide resolved

pkg/provider-local/machine-provider/local/driver.go Outdated Show resolved Hide resolved

maboehm force-pushed the machine-address branch from d36f7e3 to b696e59 Compare July 11, 2025 10:06

gardener-prow bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jul 26, 2025

gardener-prow bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jul 28, 2025

timebertt mentioned this pull request Aug 4, 2025

[GEP-28] Make provider-local machine hostnames resolvable #12657

Merged

1 task

gardener-prow bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Aug 12, 2025

gardener-prow bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Aug 13, 2025

maboehm force-pushed the machine-address branch from b696e59 to f965e40 Compare August 18, 2025 14:45

gardener-prow bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 18, 2025

timebertt changed the title ~~[GEP-28] gardenadm bootstrap: Return Addresses in provider-local~~ [GEP-28] gardenadm bootstrap: return Machine addresses in provider-local Aug 30, 2025

gardener-prow bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 1, 2025

maboehm force-pushed the machine-address branch from f965e40 to e80c7ac Compare September 2, 2025 08:42

gardener-prow bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 2, 2025

maboehm marked this pull request as ready for review September 2, 2025 08:43

gardener-prow bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Sep 2, 2025

timebertt reviewed Sep 2, 2025

View reviewed changes

gardener-prow bot assigned timebertt Sep 2, 2025

gardener-prow bot added the lgtm Indicates that a PR is ready to be merged. label Sep 2, 2025

gardener-prow bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 3, 2025

gardener-prow bot requested a review from timebertt September 3, 2025 12:34

gardener-prow bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 3, 2025

maboehm added 4 commits September 3, 2025 15:04

Return machine addresses

def14fc

use all pod.status.PodIPs in returned addresses

e5c7039

Only use PodIPs to calculate addresses

4d6d4cc

use machine.status.addresses when connecting via bastion

4f8f68c

maboehm force-pushed the machine-address branch from 3f10e97 to 4f8f68c Compare September 3, 2025 13:14

This comment was marked as resolved.

Sign in to view

timebertt reviewed Sep 3, 2025

View reviewed changes

pkg/gardenadm/botanist/ssh.go Outdated Show resolved Hide resolved

maboehm added 2 commits September 3, 2025 16:23

respect NodeHostName and use slices.MaxFunc

d00a934

use positive numbers

7761ba5

timebertt reviewed Sep 3, 2025

View reviewed changes

gardener-prow bot added the lgtm Indicates that a PR is ready to be merged. label Sep 3, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[GEP-28] `gardenadm bootstrap`: return `Machine` addresses in provider-local #12489

[GEP-28] `gardenadm bootstrap`: return `Machine` addresses in provider-local #12489

maboehm commented Jul 9, 2025 •

edited by timebertt

Loading

Uh oh!

gardener-prow bot commented Jul 9, 2025

Uh oh!

Uh oh!

timebertt left a comment

Uh oh!

Uh oh!

Uh oh!

gardener-ci-robot commented Jul 26, 2025

Uh oh!

timebertt commented Jul 28, 2025

Uh oh!

gardener-ci-robot commented Aug 12, 2025

Uh oh!

maboehm commented Aug 13, 2025

Uh oh!

timebertt left a comment

Uh oh!

gardener-prow bot commented Sep 2, 2025

Uh oh!

gardener-prow bot commented Sep 3, 2025

Uh oh!

This comment was marked as resolved.

Uh oh!

timebertt left a comment

Uh oh!

gardener-prow bot commented Sep 3, 2025

Uh oh!

Uh oh!

	// For now, we expect that the Bastion can connect to the control plane machine via its hostname and that the hostname
	// is equal to the machine's name.
	// More cases will be supported once https://github.com/gardener/machine-controller-manager/pull/1012 gets released.
	// TODO(timebertt): prefer Machine.status.addresses if present once mcm has been updated in gardener
	machineHostname := machine.Name

	// Until machine-controller-manager-provider-local reports the correct hostname/IP in Machine.status.addresses, we
	// prefix the machine name with "machine-" because we know that this is the hostname of local machines.
	// TODO(timebertt): drop this shortcut once https://github.com/gardener/gardener/pull/12489 has been merged.
	if b.Shoot.GetInfo().Spec.Provider.Type == "local" {
	machineHostname = "machine-" + machineHostname
	}

	return net.JoinHostPort(machineHostname, "22")

[GEP-28] gardenadm bootstrap: return Machine addresses in provider-local #12489

Are you sure you want to change the base?

[GEP-28] gardenadm bootstrap: return Machine addresses in provider-local #12489

Conversation

maboehm commented Jul 9, 2025 • edited by timebertt Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gardener-prow bot commented Jul 9, 2025

Uh oh!

Uh oh!

timebertt left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

gardener-ci-robot commented Jul 26, 2025

Uh oh!

timebertt commented Jul 28, 2025

Uh oh!

gardener-ci-robot commented Aug 12, 2025

Uh oh!

maboehm commented Aug 13, 2025

Uh oh!

timebertt left a comment

Choose a reason for hiding this comment

Uh oh!

gardener-prow bot commented Sep 2, 2025

Uh oh!

gardener-prow bot commented Sep 3, 2025

Uh oh!

This comment was marked as resolved.

Uh oh!

timebertt left a comment

Choose a reason for hiding this comment

Uh oh!

gardener-prow bot commented Sep 3, 2025

Uh oh!

Uh oh!

[GEP-28] `gardenadm bootstrap`: return `Machine` addresses in provider-local #12489

[GEP-28] `gardenadm bootstrap`: return `Machine` addresses in provider-local #12489

maboehm commented Jul 9, 2025 •

edited by timebertt

Loading