From b515aa1d3186ece49fb527d769dc93838770f52f Mon Sep 17 00:00:00 2001 From: "Johannes M. Scheuermann" Date: Wed, 20 Feb 2019 08:45:03 +0100 Subject: [PATCH 1/2] Use wget instead of curl for e2e network policy tests --- test/e2e/network/network_policy.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/network/network_policy.go b/test/e2e/network/network_policy.go index 57bbd77922..ffb86f3a3b 100644 --- a/test/e2e/network/network_policy.go +++ b/test/e2e/network/network_policy.go @@ -17,7 +17,7 @@ limitations under the License. package network import ( - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" networkingv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" @@ -560,7 +560,7 @@ func createNetworkClientPod(f *framework.Framework, namespace *v1.Namespace, pod Args: []string{ "/bin/sh", "-c", - fmt.Sprintf("for i in $(seq 1 5); do curl -s -m 8 %s.%s:%d && exit 0 || sleep 1; done; exit 1", + fmt.Sprintf("for i in $(seq 1 5); do wget -q -T 8 %s.%s:%d && exit 0 || sleep 1; done; exit 1", targetService.Name, targetService.Namespace, targetPort), }, }, From 30098fd73f19e324eef41832a9971c17eccbea1d Mon Sep 17 00:00:00 2001 From: "Johannes M. Scheuermann" Date: Wed, 20 Feb 2019 22:23:13 +0100 Subject: [PATCH 2/2] Make use of nc for Linux and Windows compatibility --- test/e2e/network/network_policy.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/network/network_policy.go b/test/e2e/network/network_policy.go index ffb86f3a3b..071101f4a8 100644 --- a/test/e2e/network/network_policy.go +++ b/test/e2e/network/network_policy.go @@ -560,7 +560,7 @@ func createNetworkClientPod(f *framework.Framework, namespace *v1.Namespace, pod Args: []string{ "/bin/sh", "-c", - fmt.Sprintf("for i in $(seq 1 5); do wget -q -T 8 %s.%s:%d && exit 0 || sleep 1; done; exit 1", + fmt.Sprintf("for i in $(seq 1 5); do nc -vz -w 8 %s.%s %d && exit 0 || sleep 1; done; exit 1", targetService.Name, targetService.Namespace, targetPort), }, },