github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27481 from mml/fed-nslookup

Browse Source 
Automatic merge from submit-queue

fix nslookup invocation

The old way with 'sh -c' was not correct.

For #26762
This commit is contained in:
k8s-merge-robot 2016-06-16 10:55:08 -07:00 committed by GitHub
commit 947f60843e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/federated-service.go
View File

@ -262,6 +262,10 @@ func createService(fcs *federation_internalclientset.Clientset, clusterClientSet
} }
func discoverService(f *framework.Framework, name string, exists bool) { func discoverService(f *framework.Framework, name string, exists bool) {
command := []string{"nslookup", name}
framework.Logf("Looking for the service with pod command %q", command)
pod := &api.Pod{ pod := &api.Pod{
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Name: FederatedServicePod, Name: FederatedServicePod,
@ -272,7 +276,7 @@ func discoverService(f *framework.Framework, name string, exists bool) {
{ {
Name: "federated-service-discovery-container", Name: "federated-service-discovery-container",
Image: "gcr.io/google_containers/busybox:1.24", Image: "gcr.io/google_containers/busybox:1.24",
Command: []string{"sh", "-c", "nslookup", name}, Command: command,
}, },
}, },
RestartPolicy: api.RestartPolicyNever, RestartPolicy: api.RestartPolicyNever,