Put ipv6 behind a platform prop

Author: bduffany

enterprise/server/remote_execution/containers/firecracker/firecracker.go

@@ -589,6 +589,7 @@ func (p *Provider) New(ctx context.Context, args *container.Init) (container.Com
 		EnableDockerdTcp:  args.Props.EnableDockerdTCP,
 		HostCpuid:         getCPUID(),
 		EnableVfs:         args.Props.EnableVFS,
+		Ipv6Enabled:       args.Props.NetworkEnableIPv6,
 	}
 	vmConfig.BootArgs = getBootArgs(vmConfig)
 	opts := ContainerOpts{
@@ -1621,8 +1622,7 @@ func getBootArgs(vmConfig *fcpb.VMConfiguration) string {
 		"i8042.dumbkbd",
 		"tsc=reliable",
 	}
-	if runtime.GOARCH != "amd64" {
-		// TODO(bduffany): update arm64 image and enable ipv6 on arm64 as well.
+	if !vmConfig.GetIpv6Enabled() {
 		kernelArgs = append(kernelArgs, "ipv6.disable=1")
 	}
 	if networkingEnabled(vmConfig.NetworkMode) {

enterprise/server/remote_execution/containers/firecracker/firecracker_test.go

@@ -2507,14 +2507,18 @@ func TestFirecrackerRunWithIPv6Enabled(t *testing.T) {
 			NumCpus:           1,
 			MemSizeMb:         2500,
 			NetworkMode:       fcpb.NetworkMode_NETWORK_MODE_EXTERNAL,
+			Ipv6Enabled:       true,
 			ScratchDiskSizeMb: 100,
 		},
 		ExecutorConfig: getExecutorConfig(t),
 	}
 	c, err := firecracker.NewContainer(ctx, env, &repb.ExecutionTask{}, opts)
 	require.NoError(t, err)
+	t.Cleanup(func() {
+		err := c.Remove(ctx)
+		require.NoError(t, err)
+	})
 
-	// Run will handle the full lifecycle: no need to call Remove() here.
 	res := c.Run(ctx, cmd, opts.ActionWorkingDirectory, oci.Credentials{})
 	require.NoError(t, res.Error)
 	assert.Equal(t, 0, res.ExitCode)

proto/firecracker.proto

@@ -39,6 +39,9 @@ message VMConfiguration {
   // Network mode for this VM.
   NetworkMode network_mode = 18;
 
+  // Whether IPv6 should be enabled in the guest.
+  bool ipv6_enabled = 19;
+
   bool init_dockerd = 5;
   bool debug_mode = 6;
   bool enable_dockerd_tcp = 7;

server/util/platform/platform.go

@@ -145,6 +145,10 @@ const (
 	// will have "external" network access (for backwards compatibility).
 	networkPropertyName = "network"
 
+	// NetworkEnableIPv6PropertyName specifies whether Firecracker guests should
+	// boot with IPv6 enabled.
+	NetworkEnableIPv6PropertyName = "network-enable-ipv6"
+
 	// A BuildBuddy Compute Unit is defined as 1 cpu and 2.5GB of memory.
 	EstimatedComputeUnitsPropertyName = "EstimatedComputeUnits"
 
@@ -241,6 +245,7 @@ type Properties struct {
 	DockerNetwork             string
 	ExecrootPath              string
 	Network                   string
+	NetworkEnableIPv6         bool
 	RecycleRunner             bool
 	RunnerRecyclingMaxWait    time.Duration
 
@@ -517,6 +522,7 @@ func ParseProperties(task *repb.ExecutionTask) (*Properties, error) {
 		DockerNetwork:             stringProp(m, dockerNetworkPropertyName, ""),
 		ExecrootPath:              stringProp(m, execrootPathPropertyName, ""),
 		Network:                   stringProp(m, networkPropertyName, ""),
+		NetworkEnableIPv6:         boolProp(m, NetworkEnableIPv6PropertyName, false),
 		RecycleRunner:             recycleRunner,
 		DefaultTimeout:            timeout,
 		TerminationGracePeriod:    terminationGracePeriod,