github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Use indirect streaming path for dockershim & remote CRI runtime

Browse Source
This commit is contained in:
Tim St. Clair
2016-11-04 11:50:51 -07:00
parent 0f028ff660
commit 7badc1d226
12 changed files with 139 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/kubelet/server/streaming/server_test.go
View File

@@ -68,6 +68,17 @@ func TestGetExec(t *testing.T) {
}, nil)
assert.NoError(t, err)
const pathPrefix = "cri/shim"
prefixServer, err := NewServer(Config{
Addr: testAddr,
BaseURL: &url.URL{
Scheme: "http",
Host: testAddr,
Path: "/" + pathPrefix + "/",
},
}, nil)
assert.NoError(t, err)
containerID := testContainerID
for _, test := range testcases {
request := &runtimeapi.ExecRequest{
@@ -87,6 +98,12 @@ func TestGetExec(t *testing.T) {
assert.NoError(t, err, "testcase=%+v", test)
expectedURL = "https://" + testAddr + "/exec/" + testContainerID + test.expectedQuery
assert.Equal(t, expectedURL, resp.GetUrl(), "testcase=%+v", test)
// Path prefix
resp, err = prefixServer.GetExec(request)
assert.NoError(t, err, "testcase=%+v", test)
expectedURL = "http://" + testAddr + "/" + pathPrefix + "/exec/" + testContainerID + test.expectedQuery
assert.Equal(t, expectedURL, resp.GetUrl(), "testcase=%+v", test)
}
}