diff --git a/test/e2e/framework/providers/gce/firewall.go b/test/e2e/framework/providers/gce/firewall.go index 411308946e4..798ba9c71bb 100644 --- a/test/e2e/framework/providers/gce/firewall.go +++ b/test/e2e/framework/providers/gce/firewall.go @@ -206,10 +206,6 @@ func VerifyFirewallRule(res, exp *compute.Firewall, network string, portsSubset if res.Name != exp.Name { return fmt.Errorf("incorrect name: %v, expected %v", res.Name, exp.Name) } - // Sample Network value: https://www.googleapis.com/compute/v1/projects/{project-id}/global/networks/e2e - if !strings.HasSuffix(res.Network, "/"+network) { - return fmt.Errorf("incorrect network: %v, expected ends with: %v", res.Network, "/"+network) - } actualPorts := PackProtocolsPortsFromFirewall(res.Allowed) expPorts := PackProtocolsPortsFromFirewall(exp.Allowed) diff --git a/test/e2e/network/firewall.go b/test/e2e/network/firewall.go index 9f778258951..26a07c5d501 100644 --- a/test/e2e/network/firewall.go +++ b/test/e2e/network/firewall.go @@ -77,11 +77,6 @@ var _ = common.SIGDescribe("Firewall rule", func() { firewallTestSourceRanges := []string{"0.0.0.0/1", "128.0.0.0/1"} serviceName := "firewall-test-loadbalancer" - ginkgo.By("Getting cluster ID") - clusterID, err := gce.GetClusterID(ctx, cs) - framework.ExpectNoError(err) - framework.Logf("Got cluster ID: %v", clusterID) - jig := e2eservice.NewTestJig(cs, ns, serviceName) nodeList, err := e2enode.GetBoundedReadySchedulableNodes(ctx, cs, e2eservice.MaxNodesForEndpointsTests) framework.ExpectNoError(err) @@ -98,6 +93,13 @@ var _ = common.SIGDescribe("Firewall rule", func() { svc.Spec.LoadBalancerSourceRanges = firewallTestSourceRanges }) framework.ExpectNoError(err) + + // This configmap is guaranteed to exist after a Loadbalancer type service is created + ginkgo.By("Getting cluster ID") + clusterID, err := gce.GetClusterID(ctx, cs) + framework.ExpectNoError(err) + framework.Logf("Got cluster ID: %v", clusterID) + defer func() { _, err = jig.UpdateService(ctx, func(svc *v1.Service) { svc.Spec.Type = v1.ServiceTypeNodePort