Skip to content

Enable wg access for vm in tfcmd #1467

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

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Enable wg access for vm in tfcmd #1467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion grid-cli/cmd/deploy_vm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ var deployVMCmd = &cobra.Command{
if err != nil {
return err
}
wg_access, err := cmd.Flags().GetBool("wg-access")
if err != nil {
return err
}
var seed []byte
if mycelium {
seed, err = workloads.RandomMyceliumIPSeed()
Expand Down Expand Up @@ -153,7 +157,7 @@ var deployVMCmd = &cobra.Command{

node = uint32(nodes[0].NodeID)
}
resVM, err := command.DeployVM(cmd.Context(), t, vm, mount, node)
resVM, network, err := command.DeployVM(cmd.Context(), t, vm, mount, node, wg_access)
if err != nil {
log.Fatal().Err(err).Send()
}
Expand All @@ -170,6 +174,10 @@ var deployVMCmd = &cobra.Command{
if mycelium {
log.Info().Msgf("vm mycelium ip: %s", resVM.MyceliumIP)
}
if wg_access {
log.Info().Msgf("vm wireguard ip: %s", resVM.IP)
log.Info().Msgf("vm wireguard config: %s", network.AccessWGConfig)
}
return nil
},
}
Expand Down Expand Up @@ -208,4 +216,5 @@ func init() {
deployVMCmd.Flags().Bool("ipv6", false, "assign public ipv6 for vm")
deployVMCmd.Flags().Bool("ygg", true, "assign yggdrasil ip for vm")
deployVMCmd.Flags().Bool("mycelium", true, "assign mycelium ip for vm")
deployVMCmd.Flags().Bool("wg-access", false, "add wireguard access to the vm network")
}
19 changes: 10 additions & 9 deletions grid-cli/internal/cmd/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ import (
)

// DeployVM deploys a vm with mounts
func DeployVM(ctx context.Context, t deployer.TFPluginClient, vm workloads.VM, mount workloads.Disk, node uint32) (workloads.VM, error) {
func DeployVM(ctx context.Context, t deployer.TFPluginClient, vm workloads.VM, mount workloads.Disk, node uint32, wg_access bool) (workloads.VM, workloads.ZNet, error) {
networkName := fmt.Sprintf("%snetwork", vm.Name)
projectName := fmt.Sprintf("vm/%s", vm.Name)
network, err := buildNetwork(networkName, projectName, []uint32{node}, len(vm.MyceliumIPSeed) != 0)
network, err := buildNetwork(networkName, projectName, []uint32{node}, len(vm.MyceliumIPSeed) != 0, wg_access)
if err != nil {
return workloads.VM{}, err
return workloads.VM{}, workloads.ZNet{}, err
}

mounts := []workloads.Disk{}
Expand All @@ -32,7 +32,7 @@ func DeployVM(ctx context.Context, t deployer.TFPluginClient, vm workloads.VM, m
log.Info().Msg("deploying network")
err = t.NetworkDeployer.Deploy(ctx, &network)
if err != nil {
return workloads.VM{}, errors.Wrapf(err, "failed to deploy network on node %d", node)
return workloads.VM{}, workloads.ZNet{}, errors.Wrapf(err, "failed to deploy network on node %d", node)
}

log.Info().Msg("deploying vm")
Expand All @@ -43,13 +43,13 @@ func DeployVM(ctx context.Context, t deployer.TFPluginClient, vm workloads.VM, m
if revertErr != nil {
log.Error().Err(revertErr).Msg("failed to remove network")
}
return workloads.VM{}, errors.Wrapf(err, "failed to deploy vm on node %d", node)
return workloads.VM{}, workloads.ZNet{}, errors.Wrapf(err, "failed to deploy vm on node %d", node)
}
resVM, err := t.State.LoadVMFromGrid(ctx, node, vm.Name, dl.Name)
if err != nil {
return workloads.VM{}, errors.Wrapf(err, "failed to load vm from node %d", node)
return workloads.VM{}, workloads.ZNet{}, errors.Wrapf(err, "failed to load vm from node %d", node)
}
return resVM, nil
return resVM, network, nil
}

// DeployKubernetesCluster deploys a kubernetes cluster
Expand All @@ -60,7 +60,7 @@ func DeployKubernetesCluster(ctx context.Context, t deployer.TFPluginClient, mas
if len(workers) > 0 && workers[0].Node != master.Node {
networkNodes = append(networkNodes, workers[0].Node)
}
network, err := buildNetwork(networkName, projectName, networkNodes, len(master.MyceliumIPSeed) != 0)
network, err := buildNetwork(networkName, projectName, networkNodes, len(master.MyceliumIPSeed) != 0, false)
if err != nil {
return workloads.K8sCluster{}, err
}
Expand Down Expand Up @@ -143,7 +143,7 @@ func DeployZDBs(ctx context.Context, t deployer.TFPluginClient, projectName stri
return resZDBs, nil
}

func buildNetwork(name, projectName string, nodes []uint32, addMycelium bool) (workloads.ZNet, error) {
func buildNetwork(name, projectName string, nodes []uint32, addMycelium bool, addWg bool) (workloads.ZNet, error) {
keys := make(map[uint32][]byte)
if addMycelium {
for _, node := range nodes {
Expand All @@ -163,5 +163,6 @@ func buildNetwork(name, projectName string, nodes []uint32, addMycelium bool) (w
}),
MyceliumKeys: keys,
SolutionType: projectName,
AddWGAccess: addWg,
}, nil
}