Create CNI-enabled firecracker-runtime.json on the fly

As #291 suggested, this change adds a helper that modifies
firecracker-runtime.json.

Signed-off-by: Kazuyoshi Kato <[email protected]>

Author: kzys

runtime/cni_integ_test.go

@@ -357,11 +357,16 @@ func writeCNIConf(path, chainedPluginName, networkName, nameserver string) error
 func useDefaultNetworkInterfaceRuntimeConfig(t *testing.T) {
 	t.Helper()
 
-	err := os.RemoveAll(runtimeConfigPath)
-	require.NoError(t, err, "failed to remove existing firecracker containerd runtime config file")
-
-	err = os.Symlink(defaultNetworkInterfaceRuntimeConfigPath, runtimeConfigPath)
-	require.NoError(t, err, "failed to symlink default network interface runtime config")
+	writeRuntimeConfig(func(c *Config) {
+		c.DefaultNetworkInterfaces = []proto.FirecrackerNetworkInterface{
+			{
+				CNIConfig: &proto.CNIConfiguration{
+					NetworkName:   "fcnet",
+					InterfaceName: "veth0",
+				},
+			},
+		}
+	})
 }
 
 func runCommand(ctx context.Context, t *testing.T, name string, args ...string) {

runtime/integ.go

@@ -0,0 +1,55 @@
+// Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"). You may
+// not use this file except in compliance with the License. A copy of the
+// License is located at
+//
+//	http://aws.amazon.com/apache2.0/
+//
+// or in the "license" file accompanying this file. This file is distributed
+// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+// express or implied. See the License for the specific language governing
+// permissions and limitations under the License.
+package main
+
+import (
+	"encoding/json"
+	"os"
+)
+
+const runtimeConfigPath = "/etc/containerd/firecracker-runtime.json"
+
+var defaultRuntimeConfig = Config{
+	FirecrackerBinaryPath: "/usr/local/bin/firecracker",
+	KernelImagePath:       "/var/lib/firecracker-containerd/runtime/default-vmlinux.bin",
+	KernelArgs:            "ro console=ttyS0 noapic reboot=k panic=1 pci=off nomodules systemd.journald.forward_to_console systemd.unit=firecracker.target init=/sbin/overlay-init",
+	RootDrive:             "/var/lib/firecracker-containerd/runtime/default-rootfs.img",
+	CPUCount:              1,
+	CPUTemplate:           "T2",
+	LogLevel:              "Debug",
+}
+
+func writeRuntimeConfig(options ...func(*Config)) error {
+	config := defaultRuntimeConfig
+	for _, option := range options {
+		option(&config)
+	}
+
+	file, err := os.Create(runtimeConfigPath)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+
+	bytes, err := json.Marshal(config)
+	if err != nil {
+		return err
+	}
+
+	_, err = file.Write(bytes)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

runtime/service_integ_test.go

@@ -63,9 +63,6 @@ const (
 	defaultVMRootfsPath = "/var/lib/firecracker-containerd/runtime/default-rootfs.img"
 	defaultVMNetDevName = "eth0"
 	varRunDir           = "/run/firecracker-containerd"
-
-	runtimeConfigPath                        = "/etc/containerd/firecracker-runtime.json"
-	defaultNetworkInterfaceRuntimeConfigPath = "/etc/containerd/firecracker-runtime-defaultnetwork.json"
 )
 
 // Images are presumed by the isolated tests to have already been pulled

tools/docker/Dockerfile

@@ -149,7 +149,6 @@ COPY _submodules/firecracker/target/$FIRECRACKER_TARGET/release/firecracker /usr
 COPY _submodules/firecracker/target/$FIRECRACKER_TARGET/release/jailer /usr/local/bin/
 COPY _submodules/runc/runc /usr/local/bin
 COPY tools/image-builder/rootfs.img /var/lib/firecracker-containerd/runtime/default-rootfs.img
-COPY tools/docker/firecracker-runtime.json /etc/containerd/firecracker-runtime.json
 
 # pull the images the tests need into the content store so we don't need internet
 # access during the tests themselves
@@ -165,7 +164,6 @@ RUN make -C /firecracker-containerd/internal test-bridged-tap && \
 	chmod a+x /firecracker-containerd/internal/test-bridged-tap
 
 COPY tools/docker/firecracker-runtime.json /etc/containerd/firecracker-runtime.json
-COPY tools/docker/firecracker-runtime-defaultnetwork.json /etc/containerd/firecracker-runtime-defaultnetwork.json
 COPY tools/docker/naive-snapshotter/entrypoint.sh /entrypoint
 
 ENTRYPOINT ["/entrypoint"]