chore: import siderolink as `siderolink-launch` subcommand. #8482

DmitriyMV · 2024-03-21T18:02:28Z

This PR ensures that we can test our siderolink communication using embedded siderolink-agent. If --with-siderolink provided during talos cluster create talosctl will embed proper kernel string and setup siderolink-agent as a separate process. It should be used with combination of --skip-injecting-config and --with-apply-config (the latter will use newly generated IPv6 siderolink addresses which talosctl passes to the agent as a "pre-bind").

frezbo · 2024-03-22T04:28:45Z

cmd/talosctl/cmd/mgmt/cluster/create.go

+		apiLink := "grpc://" + net.JoinHostPort(wgHost, apiPort) + "?jointoken=foo"
+
+		extraKernelArgs.Append("siderolink.api", apiLink)
+		extraKernelArgs.Append("talos.events.sink", "[fdae:41e4:649b:9303::1]:"+sinkPort)


probably makes sense to define this IP as a constant

in fact, we should calculate it or pull from the library

Done - we now use GetAgentNodeAddr() which method which uses generated prefix from wireguard.NetworkPrefix("").

pkg/provision/options.go

smira · 2024-03-22T08:22:06Z

we should add an actual test (e.g. to integration-misc) which boots with SideroLink and applies the config, otherwise we're not doing the thing fully.

smira · 2024-03-23T09:44:46Z

.drone.jsonnet

@@ -644,6 +644,13 @@ local integration_cloud_images = Step('cloud-images', depends_on=[integration_im

 local integration_reproducibility_test = Step('reproducibility-test', target='reproducibility-test', depends_on=[load_artifacts], environment={ IMAGE_REGISTRY: local_registry });

+local integration_siderolink = Step('e2e-siderolink', target='e2e-qemu', privileged=true, depends_on=[load_artifacts], environment={


it should depends_on on the previous set (default-hostname in this case)

smira · 2024-03-23T09:46:03Z

cmd/talosctl/cmd/mgmt/cluster/create.go

+		apiLink := "grpc://" + net.JoinHostPort(wgHost, apiPort) + "?jointoken=foo"
+
+		extraKernelArgs.Append("siderolink.api", apiLink)
+		extraKernelArgs.Append("talos.events.sink", "[fdae:41e4:649b:9303::1]:"+sinkPort)


let's use proper net.JoinHostPort instead of this, and the IP we should know from the SideroLink library

Done. We now use GetAgentNodeAddr which method which uses generated prefix fromwireguard.NetworkPrefix("").

smira · 2024-03-23T09:46:51Z

cmd/talosctl/cmd/mgmt/cluster/create.go

+			return errors.New("siderolink kernel arguments are already set, cannot run with --with-siderolink")
+		}
+
+		wgPort := rand.IntN(20000) + 40000


instead of this, do something like https://github.com/siderolabs/talos/pull/8476/files#diff-6ed6be17858f4d4a230f75c46a3ade864e225e78d87760e13788db4bb58fe534R261-R284

Done. We now generate ports in getDynamicPorts which uses getDynamicPort and checks that generated ports do not overlap.

smira · 2024-03-23T09:47:24Z

cmd/talosctl/cmd/mgmt/cluster/create.go

@@ -1153,6 +1208,8 @@ func init() {
 	createCmd.Flags().IntVar(&bandwidth, "with-network-bandwidth", 0, "specify bandwidth restriction (in kbps) on the bridge interface when creating a qemu cluster")
 	createCmd.Flags().StringVar(&withFirewall, firewallFlag, "", "inject firewall rules into the cluster, value is default policy - accept/block (QEMU only)")
 	createCmd.Flags().BoolVar(&withUUIDHostnames, "with-uuid-hostnames", false, "use machine UUIDs as default hostnames (QEMU only)")
+	createCmd.Flags().BoolVar(&withSiderolinkAgent, "with-siderolink", false, "enables the use of siderolink agent as configuration apply mechanism")
+	createCmd.Flags().MarkHidden("with-siderolink") //nolint:errcheck


why hidden? we should have it

smira · 2024-03-23T09:49:03Z

cmd/talosctl/cmd/siderolink/agent.go

+}
+
+var siderolinkCmd = &cobra.Command{
+	Use:    "siderolink-launch",


why do we need another folder? can we put it next to other *-launch commands, and we can make the whole file //go:build linux to have less moving parts

Done. Moved to cmd/talosctl/cmd/mgmt/siderolink_launch_linux.go

DmitriyMV · 2024-03-23T12:04:12Z

/promote integration-misc

This PR ensures that we can test our siderolink communication using embedded siderolink-agent. If `--with-siderolink` provided during `talos cluster create` talosctl will embed proper kernel string and setup `siderolink-agent` as a separate process. It should be used with combination of `--skip-injecting-config` and `--with-apply-config` (the latter will use newly generated IPv6 siderolink addresses which talosctl passes to the agent as a "pre-bind"). Fixes siderolabs#8392 Signed-off-by: Dmitriy Matrenichev <dmitry.matrenichev@siderolabs.com>

smira

🆒

DmitriyMV · 2024-03-23T13:47:27Z

/m

talos-bot added the status/ok-to-test label Mar 21, 2024

DmitriyMV force-pushed the siderolink-agent branch 3 times, most recently from 60f2003 to c638d32 Compare March 21, 2024 18:48

frezbo reviewed Mar 22, 2024

View reviewed changes

pkg/provision/options.go Outdated Show resolved Hide resolved

DmitriyMV force-pushed the siderolink-agent branch 2 times, most recently from a0e2188 to be2d33a Compare March 22, 2024 19:14

smira reviewed Mar 23, 2024

View reviewed changes

DmitriyMV force-pushed the siderolink-agent branch 4 times, most recently from bc2f70a to 4b675ed Compare March 23, 2024 11:38

DmitriyMV force-pushed the siderolink-agent branch from 4b675ed to 949ad11 Compare March 23, 2024 13:10

smira approved these changes Mar 23, 2024

View reviewed changes

talos-bot added the status/ok-to-merge label Mar 23, 2024

talos-bot merged commit 949ad11 into siderolabs:main Mar 23, 2024
18 checks passed

talos-bot removed status/ok-to-test status/ok-to-merge labels Mar 23, 2024

DmitriyMV deleted the siderolink-agent branch March 23, 2024 13:49

DmitriyMV linked an issue Apr 1, 2024 that may be closed by this pull request

integrate siderolink-agent into talosctl cluster create #8392

Closed

DmitriyMV self-assigned this Apr 1, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: import siderolink as `siderolink-launch` subcommand. #8482

chore: import siderolink as `siderolink-launch` subcommand. #8482

DmitriyMV commented Mar 21, 2024

frezbo Mar 22, 2024

smira Mar 22, 2024

DmitriyMV Mar 23, 2024

smira commented Mar 22, 2024

smira Mar 23, 2024

DmitriyMV Mar 23, 2024

smira Mar 23, 2024

DmitriyMV Mar 23, 2024

smira Mar 23, 2024

DmitriyMV Mar 23, 2024

smira Mar 23, 2024

DmitriyMV Mar 23, 2024

smira Mar 23, 2024

DmitriyMV Mar 23, 2024

DmitriyMV commented Mar 23, 2024

smira left a comment

DmitriyMV commented Mar 23, 2024

		@@ -644,6 +644,13 @@ local integration_cloud_images = Step('cloud-images', depends_on=[integration_im

		local integration_reproducibility_test = Step('reproducibility-test', target='reproducibility-test', depends_on=[load_artifacts], environment={ IMAGE_REGISTRY: local_registry });

		local integration_siderolink = Step('e2e-siderolink', target='e2e-qemu', privileged=true, depends_on=[load_artifacts], environment={

chore: import siderolink as siderolink-launch subcommand. #8482

chore: import siderolink as siderolink-launch subcommand. #8482

Conversation

DmitriyMV commented Mar 21, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

smira commented Mar 22, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DmitriyMV commented Mar 23, 2024

smira left a comment

Choose a reason for hiding this comment

DmitriyMV commented Mar 23, 2024

chore: import siderolink as `siderolink-launch` subcommand. #8482

chore: import siderolink as `siderolink-launch` subcommand. #8482