Stable 1.6 backports

README.md

@@ -88,7 +88,7 @@ See the
 
 ## Architecture overview
 
-See the [architecture overview](https://github.com/kata-containers/documentation/blob/master/architecture.md)
+See the [architecture overview](https://github.com/kata-containers/documentation/blob/master/design/architecture.md)
 for details on the Kata Containers design.
 
 ## Configuration

cli/factory.go

@@ -185,6 +185,7 @@ var initFactoryCommand = cli.Command{
 					HypervisorConfig: runtimeConfig.HypervisorConfig,
 					AgentType:        runtimeConfig.AgentType,
 					AgentConfig:      runtimeConfig.AgentConfig,
+					ProxyType:        runtimeConfig.ProxyType,
 				},
 			}
 			kataLog.WithField("factory", factoryConfig).Info("create vm factory")

cli/factory_test.go

@@ -17,6 +17,8 @@ import (
 	vc "github.com/kata-containers/runtime/virtcontainers"
 )
 
+const testDisabledAsNonRoot = "Test disabled as requires root privileges"
+
 func TestFactoryCLIFunctionNoRuntimeConfig(t *testing.T) {
 	assert := assert.New(t)
 
@@ -63,9 +65,14 @@ func TestFactoryCLIFunctionInit(t *testing.T) {
 	assert.Nil(err)
 
 	// With template
+	if os.Geteuid() != 0 {
+		t.Skip(testDisabledAsNonRoot)
+	}
+
 	runtimeConfig.FactoryConfig.Template = true
 	runtimeConfig.HypervisorType = vc.MockHypervisor
 	runtimeConfig.AgentType = vc.NoopAgentType
+	runtimeConfig.ProxyType = vc.NoopProxyType
 	ctx.App.Metadata["runtimeConfig"] = runtimeConfig
 	fn, ok = initFactoryCommand.Action.(func(context *cli.Context) error)
 	assert.True(ok)

pkg/katautils/config.go

@@ -357,12 +357,13 @@ func (h hypervisor) getInitrdAndImage() (initrd string, image string, err error)
 	return
 }
 
-func (p proxy) path() string {
-	if p.Path == "" {
-		return defaultProxyPath
+func (p proxy) path() (string, error) {
+	path := p.Path
+	if path == "" {
+		path = defaultProxyPath
 	}
 
-	return p.Path
+	return ResolvePath(path)
 }
 
 func (p proxy) debug() bool {
@@ -606,8 +607,13 @@ func updateRuntimeConfigProxy(configPath string, tomlConf tomlConfig, config *oc
 			config.ProxyType = vc.KataProxyType
 		}
 
+		path, err := proxy.path()
+		if err != nil {
+			return err
+		}
+
 		config.ProxyConfig = vc.ProxyConfig{
-			Path:  proxy.path(),
+			Path:  path,
 			Debug: proxy.debug(),
 		}
 	}

pkg/katautils/config_test.go

@@ -1122,13 +1122,43 @@ func TestHypervisorDefaultsGuestHookPath(t *testing.T) {
 }
 
 func TestProxyDefaults(t *testing.T) {
+	assert := assert.New(t)
+
+	tmpdir, err := ioutil.TempDir(testDir, "")
+	assert.NoError(err)
+	defer os.RemoveAll(tmpdir)
+
+	testProxyPath := filepath.Join(tmpdir, "proxy")
+	testProxyLinkPath := filepath.Join(tmpdir, "proxy-link")
+
+	err = createEmptyFile(testProxyPath)
+	assert.NoError(err)
+
+	err = syscall.Symlink(testProxyPath, testProxyLinkPath)
+	assert.NoError(err)
+
+	savedProxyPath := defaultProxyPath
+
+	defer func() {
+		defaultProxyPath = savedProxyPath
+	}()
+
+	defaultProxyPath = testProxyPath
 	p := proxy{}
+	path, err := p.path()
+	assert.NoError(err)
+	assert.Equal(path, defaultProxyPath, "default proxy path wrong")
 
-	assert.Equal(t, p.path(), defaultProxyPath, "default proxy path wrong")
+	// test path resolution
+	defaultProxyPath = testProxyLinkPath
+	p = proxy{}
+	path, err = p.path()
+	assert.NoError(err)
+	assert.Equal(path, testProxyPath)
 
-	path := "/foo/bar/baz/proxy"
-	p.Path = path
-	assert.Equal(t, p.path(), path, "custom proxy path wrong")
+	assert.False(p.debug())
+	p.Debug = true
+	assert.True(p.debug())
 }
 
 func TestShimDefaults(t *testing.T) {

virtcontainers/api.go

@@ -108,7 +108,7 @@ func createSandboxFromConfig(ctx context.Context, sandboxConfig SandboxConfig, f
 		}
 	}()
 
-	if err := s.getAndStoreGuestDetails(); err != nil {
+	if err = s.getAndStoreGuestDetails(); err != nil {
 		return nil, err
 	}