Skip to content

[WIP] fix: add wireguard setup in node bootstrap config #47

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

Draft
bcho wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[WIP] fix: add wireguard setup in node bootstrap config #47

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
32 changes: 31 additions & 1 deletion cli/internal/config/nodebootstrap/nodebootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ import (
"context"
"fmt"
"io"
"strings"

"github.com/spf13/cobra"

"github.com/Azure/aks-flex/plugin/pkg/services/agentpools/nebius/instance"
"github.com/Azure/aks-flex/plugin/pkg/services/agentpools/userdata/flex"
"github.com/Azure/aks-flex/plugin/pkg/services/agentpools/userdata/ubuntu"
"github.com/Azure/aks-flex/plugin/pkg/util/cloudinit"
Expand All @@ -25,6 +27,8 @@ var flagEnableNvidiaGPURuntime bool
var flagVariant string
var flagArch string
var flagKubeVersion string
var flagWireguardIP string
var flagWireguardSite string

func init() {
r.Handle("ubuntu", writeUbuntuUserData)
Expand All @@ -37,6 +41,10 @@ func init() {
"Kubernetes version for the downloaded binaries (e.g. 1.33.3).")
Command.Flags().StringVar(&flagVariant, "variant", variantCloudInit,
fmt.Sprintf("Output variant: %q produces cloud-init YAML user data, %q produces an equivalent standalone bash script.", variantCloudInit, variantScript))
Command.Flags().StringVar(&flagWireguardIP, "wireguard-ip", "",
"WireGuard peer IP address for the node.")
Command.Flags().StringVar(&flagWireguardSite, "wireguard-site", "remote",
"WireGuard site for the node.")
}

// marshalUserData marshals the cloud-init UserData according to the selected
Expand All @@ -62,15 +70,37 @@ func marshalUserData(ud *cloudinit.UserData, w io.Writer) error {
}

func writeFlexUserData(ctx context.Context, w io.Writer) error {
kubeadmConfig := configcmd.DefaultKubeadmConfig(ctx)
if flagWireguardIP != "" {
kubeadmConfig.SetNodeIp(flagWireguardIP)
}

ud, err := flex.UserData(
flex.WithEnableNvidiaGPURuntime(flagEnableNvidiaGPURuntime),
flex.WithArch(flagArch),
flex.WithKubeVersion(flagKubeVersion),
flex.WithKubeadmConfig(configcmd.DefaultKubeadmConfig(ctx)),
flex.WithKubeadmConfig(kubeadmConfig),
)
if err != nil {
return fmt.Errorf("generating flex userdata: %w", err)
}

if flagWireguardIP != "" {
ud.Packages = append(ud.Packages, "wireguard", "wireguard-tools")
ud.WriteFiles = append(ud.WriteFiles, &cloudinit.WriteFile{
Path: "/root/wg-spoke.sh",
Content: instance.GetWgSpokeScript(),
Permissions: "0755",
})
ud.RunCmd = append(ud.RunCmd, strings.Join([]string{
"export ANNOTATION_PREFIX='stretch.azure.com/wireguard-'",
fmt.Sprintf("export WG_ADDRESS='%s/32'", flagWireguardIP),
fmt.Sprintf("export WG_SITE='%s'", flagWireguardSite),
"export WG_DAEMONIZE='true'",
"/root/wg-spoke.sh",
}, "\n"))
}

return marshalUserData(ud, w)
}

Expand Down
4 changes: 4 additions & 0 deletions plugin/pkg/services/agentpools/nebius/instance/agentpools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ import (
//go:embed assets/wg-spoke.sh
var wgSpokeScript string

func GetWgSpokeScript() string {
return wgSpokeScript
}

var _ api.Object = (*AgentPool)(nil)

type agentPoolsServer struct {
Expand Down
Loading