Merge pull request cri-o#4097 from harche/runc_abst

Mrunal Patel · web-flow · commit fdf23493aab7 · 2020-08-24T14:54:11.000-07:00
handle runc not present on the system
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -456,11 +456,17 @@ func (c *Config) UpdateFromFile(path string) error {
 	t := new(tomlConfig)
 	t.fromConfig(c)
 
-	_, err = toml.Decode(string(data), t)
+	metadata, err := toml.Decode(string(data), t)
 	if err != nil {
 		return fmt.Errorf("unable to decode configuration %v: %v", path, err)
 	}
 
+	runtimesKey := []string{"crio", "runtime", "default_runtime"}
+	if metadata.IsDefined(runtimesKey...) &&
+		t.Crio.Runtime.RuntimeConfig.DefaultRuntime != defaultRuntime {
+		delete(c.Runtimes, defaultRuntime)
+	}
+
 	t.toConfig(c)
 	c.singleConfigPath = path
 	return nil
diff --git a/pkg/config/template.go b/pkg/config/template.go
@@ -110,7 +110,8 @@ grpc_max_recv_msg_size = {{ .GRPCMaxRecvMsgSize }}
 {{ range $ulimit := .DefaultUlimits }}{{ printf "#\t%q,\n" $ulimit }}{{ end }}#]
 
 # default_runtime is the _name_ of the OCI runtime to be used as the default.
-# The name is matched against the runtimes map below.
+# The name is matched against the runtimes map below. If this value is changed,
+# the corresponding existing entry from the runtimes map below will be ignored.
 default_runtime = "{{ .DefaultRuntime }}"
 
 # If true, the runtime will not use pivot_root, but instead use MS_MOVE.
