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

rename machines to connections in config

Browse Source
This commit is contained in:
Pavel Sviderski
2024-09-10 16:20:00 +10:00
parent ddf7d23351
commit 4e2640bbd2
4 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/cli/client/cluster.go
+23 -10
View File
@@ -39,7 +39,7 @@ func (c *ClusterClient) Name() string {
// HasMachines returns true if the cluster has at least one machine specified in the config.
func (c *ClusterClient) HasMachines() bool {
return len(c.config.Machines) > 0
return len(c.config.Connections) > 0
}
func (c *ClusterClient) User() (*User, error) {
@@ -108,10 +108,13 @@ func (c *ClusterClient) AddMachine(
return "", config.MachineConnection{}, uErr
}
_, rErr := exec.Run(ctx, sshexec.QuoteCommand(
sudoPrefix, "uncloud", "machine", "init",
"--name", name,
"--user-pubkey", clusterUser.PublicKey().String()))
_, rErr := exec.Run(
ctx, sshexec.QuoteCommand(
sudoPrefix, "uncloud", "machine", "init",
"--name", name,
"--user-pubkey", clusterUser.PublicKey().String(),
),
)
if rErr != nil {
return "", config.MachineConnection{}, fmt.Errorf("initialise a new cluster on machine: %w", rErr)
}
@@ -129,7 +132,9 @@ func (c *ClusterClient) AddMachine(
_, err = exec.Run(ctx, sshexec.QuoteCommand(sudoPrefix, "mkdir", "-m", "700", "-p", machine.DefaultDataDir))
if err != nil {
return "", config.MachineConnection{}, fmt.Errorf("create data directory %q: %w", machine.DefaultDataDir, err)
return "", config.MachineConnection{}, fmt.Errorf(
"create data directory %q: %w", machine.DefaultDataDir, err,
)
}
// Write the machine config to /var/lib/uncloud/machine.json by piping the JSON data to the file.
@@ -139,8 +144,12 @@ func (c *ClusterClient) AddMachine(
}
mcfgPath := sshexec.Quote(machine.StatePath(machine.DefaultDataDir))
createFileCmd := fmt.Sprintf("%s touch %s && %s chmod 600 %s", sudoPrefix, mcfgPath, sudoPrefix, mcfgPath)
_, err = exec.Run(ctx, fmt.Sprintf("%s && echo %s | %s tee %s > /dev/null",
createFileCmd, sshexec.Quote(string(mcfgData)), sudoPrefix, mcfgPath))
_, err = exec.Run(
ctx, fmt.Sprintf(
"%s && echo %s | %s tee %s > /dev/null",
createFileCmd, sshexec.Quote(string(mcfgData)), sudoPrefix, mcfgPath,
),
)
if err != nil {
return "", config.MachineConnection{}, fmt.Errorf("write machine config to %q: %w", mcfgPath, err)
}
@@ -162,8 +171,12 @@ func (c *ClusterClient) AddMachine(
return "", config.MachineConnection{}, fmt.Errorf("parse machine token: %w", err)
}
// TODO: replace command runs with sending gRPC request to the machine API via unix socket.
name, err = exec.Run(ctx, fmt.Sprintf("%s cat %s | grep Name | cut -d'\"' -f4",
sudoPrefix, machine.StatePath(machine.DefaultDataDir)))
name, err = exec.Run(
ctx, fmt.Sprintf(
"%s cat %s | grep Name | cut -d'\"' -f4",
sudoPrefix, machine.StatePath(machine.DefaultDataDir),
),
)
if err != nil {
return "", config.MachineConnection{}, fmt.Errorf("get machine name: %w: %s", err, out)
}