philipp/uncloud
1
0
Fork 0
mirror of https://github.com/psviderski/uncloud.git synced 2026-08-26 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

cluster: derive default machine name from its hostname when adding to cluster

Browse Source
This commit is contained in:
Pasha Sviderski
2026-06-19 16:54:59 +10:00
parent e3823c29bf
commit 0c42a7df65
8 changed files with 352 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/machine/machine.go
+8 -3
View File
@@ -766,9 +766,11 @@ func (m *Machine) InitCluster(ctx context.Context, req *pb.InitClusterRequest) (
}
slog.Info("Cluster state initialised.", "network", clusterNetwork.String())
// Default the machine name to the machine's hostname when not explicitly provided.
machineName := req.MachineName
if machineName == "" {
if machineName, err = cluster.NewRandomMachineName(); err != nil {
hostname, _ := os.Hostname()
if machineName, err = cluster.DefaultMachineName(hostname, nil); err != nil {
return nil, status.Errorf(codes.Internal, "generate machine name: %v", err)
}
}
@@ -996,6 +998,8 @@ func (m *Machine) Inspect(_ context.Context, _ *emptypb.Empty) (*pb.MachineInfo,
}
func (m *Machine) InspectMachine(ctx context.Context, _ *emptypb.Empty) (*pb.InspectMachineResponse, error) {
hostname, _ := os.Hostname()
storeVersion, err := m.store.Version(ctx)
if err != nil {
return nil, status.Errorf(codes.Internal, "get cluster store version: %v", err)
@@ -1014,8 +1018,9 @@ func (m *Machine) InspectMachine(ctx context.Context, _ *emptypb.Empty) (*pb.Ins
{
// Metadata is injected by the gRPC proxy.
Machine: &pb.MachineInfo{
Id: m.state.ID,
Name: m.state.Name,
Id: m.state.ID,
Name: m.state.Name,
Hostname: hostname,
Network: &pb.NetworkConfig{
Subnet: pb.NewIPPrefix(m.state.Network.Subnet),
ManagementIp: pb.NewIP(m.state.Network.ManagementIP),