Merge pull request #459 from kzys/runc-args

Override Process.Args regardless of the existing value

Author: Kazuyoshi Kato

runtime/runc_jailer.go

@@ -258,7 +258,7 @@ func (j *runcJailer) BuildJailedRootHandler(cfg *config.Config, machineConfig *f
 			j.logger.Debugf("Writing %q for runc", rootPathToConfig)
 			// we pass m.Cfg as opposed to machineConfig as we want the populated
 			// config defaults when calling NewMachine
-			if err := j.overwriteConfig(cfg, &m.Cfg, filepath.Base(m.Cfg.SocketPath), rootPathToConfig); err != nil {
+			if err := j.overwriteConfig(&m.Cfg, filepath.Base(m.Cfg.SocketPath), rootPathToConfig); err != nil {
 				return errors.Wrap(err, "failed to overwrite config.json")
 			}
 
@@ -478,7 +478,7 @@ func (j *runcJailer) jailerCommand(containerName string, isDebug bool) *exec.Cmd
 }
 
 // overwriteConfig will set the proper default values if a field had not been set.
-func (j *runcJailer) overwriteConfig(cfg *config.Config, machineConfig *firecracker.Config, socketPath, configPath string) error {
+func (j *runcJailer) overwriteConfig(machineConfig *firecracker.Config, socketPath, configPath string) error {
 	spec := j.configSpec
 	if spec.Process.User.UID != 0 ||
 		spec.Process.User.GID != 0 {
@@ -489,7 +489,7 @@ func (j *runcJailer) overwriteConfig(cfg *config.Config, machineConfig *firecrac
 		)
 	}
 
-	spec = j.setDefaultConfigValues(cfg, socketPath, spec)
+	spec = j.setDefaultConfigValues(socketPath, spec)
 	spec.Root.Path = rootfsFolder
 	spec.Root.Readonly = false
 	spec.Process.User.UID = j.Config.UID
@@ -537,24 +537,21 @@ func (j runcJailer) CgroupPath() string {
 	return filepath.Join(basePath, j.vmID)
 }
 
-// setDefaultConfigValues will process the spec file provided and allow any
-// empty/zero values to be replaced with default values.
-func (j *runcJailer) setDefaultConfigValues(cfg *config.Config, socketPath string, spec specs.Spec) specs.Spec {
+// setDefaultConfigValues will override the spec to start Firecracker inside.
+func (j *runcJailer) setDefaultConfigValues(socketPath string, spec specs.Spec) specs.Spec {
 	if spec.Process == nil {
 		spec.Process = &specs.Process{}
 	}
 
-	if spec.Process.Args == nil {
-		cmd := firecracker.VMCommandBuilder{}.
-			WithBin("/" + firecrackerFileName).
-			WithSocketPath(socketPath).
-			WithArgs([]string{"--id", j.vmID}).
-			// Don't need to pass in an actual context here as we are only building
-			// the command arguments and not actually building a command
-			Build(context.Background())
+	cmd := firecracker.VMCommandBuilder{}.
+		WithBin("/" + firecrackerFileName).
+		WithSocketPath(socketPath).
+		WithArgs([]string{"--id", j.vmID}).
+		// Don't need to pass in an actual context here as we are only building
+		// the command arguments and not actually building a command
+		Build(context.Background())
 
-		spec.Process.Args = cmd.Args
-	}
+	spec.Process.Args = cmd.Args
 
 	cgroupPath := j.CgroupPath()
 	j.logger.WithField("CgroupPath", cgroupPath).Debug("using cgroup path")

runtime/service_integ_test.go

@@ -1602,13 +1602,13 @@ func TestStopVM_Isolated(t *testing.T) {
 
 		t.Run(test.name, func(t *testing.T) {
 			req := test.createVMRequest
-			req.VMID = testNameToVMID(test.name)
+			req.VMID = testNameToVMID(t.Name())
 			testFunc(t, req)
 		})
 
 		t.Run(test.name+"/Jailer", func(t *testing.T) {
 			req := test.createVMRequest
-			req.VMID = testNameToVMID(test.name) + "_Jailer"
+			req.VMID = testNameToVMID(t.Name())
 			req.JailerConfig = &proto.JailerConfig{
 				UID: 300000,
 				GID: 300000,
@@ -2007,7 +2007,7 @@ func TestCreateVM_Isolated(t *testing.T) {
 			UID: 30000,
 			GID: 30000,
 		}
-		t.Run(subtest.name+" with Jailer", func(t *testing.T) {
+		t.Run(subtest.name+"/Jailer", func(t *testing.T) {
 			runTest(t, requestWithJailer, validate)
 		})
 	}