From e250c465989a75b2b80c07a29bdbcf85ab31fe16 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Thu, 8 Jan 2015 05:54:44 -0800 Subject: [PATCH] GKE: Fix services.sh for server versions < 0.8.0 Commit e045c6ce broke this test against all server versions <0.8.0, which immediately broke the GKE Jenkins runs. --- hack/e2e-suite/services.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hack/e2e-suite/services.sh b/hack/e2e-suite/services.sh index d5d23e9ddc0..cabf8de56a2 100755 --- a/hack/e2e-suite/services.sh +++ b/hack/e2e-suite/services.sh @@ -388,8 +388,10 @@ verify_from_container "${svc3_name}" "${svc3_ip}" "${svc3_port}" \ # echo "Test 5: Remove the iptables rules, make sure they come back." echo "Manually removing iptables rules" -ssh-to-node "${test_node}" "sudo iptables -t nat -F KUBE-PORTALS-HOST" -ssh-to-node "${test_node}" "sudo iptables -t nat -F KUBE-PORTALS-CONTAINER" +# Remove both the new and old style chains, in case we're testing on an old kubelet +ssh-to-node "${test_node}" "sudo iptables -t nat -F KUBE-PORTALS-HOST || true" +ssh-to-node "${test_node}" "sudo iptables -t nat -F KUBE-PORTALS-CONTAINER || true" +ssh-to-node "${test_node}" "sudo iptables -t nat -F KUBE-PROXY || true" echo "Verifying the portals from the host" wait_for_service_up "${svc3_name}" "${svc3_ip}" "${svc3_port}" \ "${svc3_count}" "${svc3_pods}"