github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

use agnhost image

Browse Source 
add back ServeHostnameImage
This commit is contained in:
Yongli Chen 2019-08-11 18:44:47 -07:00
parent 47e78f3de5
commit 68e553ae6c
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
test/e2e/framework/util.go
View File

@ -208,6 +208,9 @@ var (
// BusyBoxImage is the image URI of BusyBox. // BusyBoxImage is the image URI of BusyBox.
BusyBoxImage = imageutils.GetE2EImage(imageutils.BusyBox) BusyBoxImage = imageutils.GetE2EImage(imageutils.BusyBox)
// AgnHostImage is the image URI of AgnHost
AgnHostImage = imageutils.GetE2EImage(imageutils.Agnhost)
// For parsing Kubectl version for version-skewed testing. // For parsing Kubectl version for version-skewed testing.
gitVersionRegexp = regexp.MustCompile("GitVersion:\"(v.+?)\"") gitVersionRegexp = regexp.MustCompile("GitVersion:\"(v.+?)\"")
@ -474,8 +477,8 @@ func ProxyMode(f *Framework) (string, error) {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "detector", Name: "detector",
Image: imageutils.GetE2EImage(imageutils.Agnhost), Image: AgnHostImage,
Command: []string{"/bin/sleep", "3600"}, Command: []string{"pause"},
}, },
}, },
}, },
@ -2876,29 +2879,19 @@ func UnblockNetwork(from string, to string) {
} }
} }
// PingCommand is the type to hold ping command.
type PingCommand string
const (
// IPv4PingCommand is a ping command for IPv4.
IPv4PingCommand PingCommand = "ping"
// IPv6PingCommand is a ping command for IPv6.
IPv6PingCommand PingCommand = "ping6"
)
// CheckConnectivityToHost launches a pod to test connectivity to the specified // CheckConnectivityToHost launches a pod to test connectivity to the specified
// host. An error will be returned if the host is not reachable from the pod. // host. An error will be returned if the host is not reachable from the pod.
// //
// An empty nodeName will use the schedule to choose where the pod is executed. // An empty nodeName will use the schedule to choose where the pod is executed.
func CheckConnectivityToHost(f *Framework, nodeName, podName, host string, pingCmd PingCommand, timeout int) error { func CheckConnectivityToHost(f *Framework, nodeName, podName, host string, port, timeout int) error {
contName := fmt.Sprintf("%s-container", podName) contName := fmt.Sprintf("%s-container", podName)
command := []string{ command := []string{
string(pingCmd), "nc",
"-c", "3", // send 3 pings "-vz",
"-W", "2", // wait at most 2 seconds for a reply
"-w", strconv.Itoa(timeout), "-w", strconv.Itoa(timeout),
host, host,
strconv.Itoa(port),
} }
pod := &v1.Pod{ pod := &v1.Pod{
@ -2909,7 +2902,7 @@ func CheckConnectivityToHost(f *Framework, nodeName, podName, host string, pingC
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: contName, Name: contName,
Image: BusyBoxImage, Image: AgnHostImage,
Command: command, Command: command,
}, },
}, },
@ -3257,7 +3250,7 @@ func (f *Framework) NewAgnhostPod(name string, args ...string) *v1.Pod {
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "agnhost", Name: "agnhost",
Image: imageutils.GetE2EImage(imageutils.Agnhost), Image: AgnHostImage,
Args: args, Args: args,
}, },
}, },

4
test/e2e/network/networking.go
View File

@ -49,13 +49,13 @@ var _ = SIGDescribe("Networking", func() {
ginkgo.It("should provide Internet connection for containers [Feature:Networking-IPv4]", func() { ginkgo.It("should provide Internet connection for containers [Feature:Networking-IPv4]", func() {
ginkgo.By("Running container which tries to ping 8.8.8.8") ginkgo.By("Running container which tries to ping 8.8.8.8")
framework.ExpectNoError( framework.ExpectNoError(
framework.CheckConnectivityToHost(f, "", "ping-test", "8.8.8.8", framework.IPv4PingCommand, 30)) framework.CheckConnectivityToHost(f, "", "connectivity-test", "8.8.8.8", 53, 30))
}) })
ginkgo.It("should provide Internet connection for containers [Feature:Networking-IPv6][Experimental]", func() { ginkgo.It("should provide Internet connection for containers [Feature:Networking-IPv6][Experimental]", func() {
ginkgo.By("Running container which tries to ping 2001:4860:4860::8888") ginkgo.By("Running container which tries to ping 2001:4860:4860::8888")
framework.ExpectNoError( framework.ExpectNoError(
framework.CheckConnectivityToHost(f, "", "ping-test", "2001:4860:4860::8888", framework.IPv6PingCommand, 30)) framework.CheckConnectivityToHost(f, "", "connectivity-test", "2001:4860:4860::8888", 53, 30))
}) })
// First test because it has no dependencies on variables created later on. // First test because it has no dependencies on variables created later on.