Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

check server version at correct point in e2e flow #61289

Merged
merged 1 commit into from
Mar 17, 2018
Merged

check server version at correct point in e2e flow #61289

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 18 additions & 7 deletions test/e2e/network/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,19 +77,30 @@ var _ = SIGDescribe("Proxy", func() {
Description: Ensure that proxy on node logs works with generic top
level prefix proxy and explicit kubelet port.
*/
if !skipPrefixProxyTests {
framework.ConformanceIt("should proxy logs on node with explicit kubelet port ", func() { nodeProxyTest(f, prefix+"/proxy/nodes/", ":10250/logs/") })
}
framework.ConformanceIt("should proxy logs on node with explicit kubelet port ", func() {
if skipPrefixProxyTests {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the value is set in BeforeEach, so is only valid to check inside the It() blocks

framework.Skipf("/proxy prefix removed on newer server version")
}
nodeProxyTest(f, prefix+"/proxy/nodes/", ":10250/logs/")
})

/*
Testname: proxy-prefix-node-logs
Description: Ensure that proxy on node logs works with generic top
level prefix proxy.
*/
if !skipPrefixProxyTests {
framework.ConformanceIt("should proxy logs on node ", func() { nodeProxyTest(f, prefix+"/proxy/nodes/", "/logs/") })
It("should proxy to cadvisor", func() { nodeProxyTest(f, prefix+"/proxy/nodes/", ":4194/containers/") })
}
framework.ConformanceIt("should proxy logs on node ", func() {
if skipPrefixProxyTests {
framework.Skipf("/proxy prefix removed on newer server version")
}
nodeProxyTest(f, prefix+"/proxy/nodes/", "/logs/")
})
It("should proxy to cadvisor", func() {
if skipPrefixProxyTests {
framework.Skipf("/proxy prefix removed on newer server version")
}
nodeProxyTest(f, prefix+"/proxy/nodes/", ":4194/containers/")
})

/*
Testname: proxy-subresource-node-logs-port
Expand Down