From 60520b6d4a25ff0b05f77a23dd86bac909ca1474 Mon Sep 17 00:00:00 2001 From: upodroid Date: Thu, 9 Nov 2023 20:39:42 -0600 Subject: [PATCH 1/2] look for the cm after the lb is created --- test/e2e/network/firewall.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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 From 4c06bd5bbb8038b8c028ac2155a26c6ff0fa2187 Mon Sep 17 00:00:00 2001 From: upodroid Date: Fri, 10 Nov 2023 15:33:33 -0600 Subject: [PATCH 2/2] fix bad assumptions in gce network tests --- test/e2e/framework/providers/gce/firewall.go | 4 ---- 1 file changed, 4 deletions(-) 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)