Merge pull request #75892 from rramkumar1/patch-14

Remove static IP test from Ingress-GCE e2e tests

test/e2e/network/ingress.go

@@ -55,14 +55,12 @@ var _ = SIGDescribe("Loadbalancing: L7", func() {
 		ns               string
 		jig              *ingress.TestJig
 		conformanceTests []ingress.ConformanceTests
-		cloudConfig      framework.CloudConfig
 	)
 	f := framework.NewDefaultFramework("ingress")
 
 	BeforeEach(func() {
 		jig = ingress.NewIngressTestJig(f.ClientSet)
 		ns = f.Namespace.Name
-		cloudConfig = framework.TestContext.CloudConfig
 
 		// this test wants powerful permissions.  Since the namespace names are unique, we can leave this
 		// lying around so we don't have to race any caches
@@ -124,36 +122,6 @@ var _ = SIGDescribe("Loadbalancing: L7", func() {
 			}
 		})
 
-		It("should create ingress with given static-ip", func() {
-			// ip released when the rest of lb resources are deleted in CleanupIngressController
-			ip := gceController.CreateStaticIP(ns)
-			By(fmt.Sprintf("allocated static ip %v: %v through the GCE cloud provider", ns, ip))
-			executeStaticIPHttpsOnlyTest(f, jig, ns, ip)
-
-			By("should have correct firewall rule for ingress")
-			fw := gceController.GetFirewallRule()
-			nodeTags := []string{cloudConfig.NodeTag}
-			if framework.TestContext.Provider != "gce" {
-				// nodeTags would be different in GKE.
-				nodeTags = gce.GetNodeTags(jig.Client, cloudConfig)
-			}
-			expFw := jig.ConstructFirewallForIngress(gceController.GetFirewallRuleName(), nodeTags)
-			// Passed the last argument as `true` to verify the backend ports is a subset
-			// of the allowed ports in firewall rule, given there may be other existing
-			// ingress resources and backends we are not aware of.
-			Expect(gce.VerifyFirewallRule(fw, expFw, gceController.Cloud.Network, true)).NotTo(HaveOccurred())
-
-			// TODO: uncomment the restart test once we have a way to synchronize
-			// and know that the controller has resumed watching. If we delete
-			// the ingress before the controller is ready we will leak.
-			// By("restarting glbc")
-			// restarter := NewRestartConfig(
-			//	 framework.GetMasterHost(), "glbc", glbcHealthzPort, restartPollInterval, restartTimeout)
-			// restarter.restart()
-			// By("should continue serving on provided static-ip for 30 seconds")
-			// framework.ExpectNoError(jig.verifyURL(fmt.Sprintf("https://%v/", ip), "", 30, 1*time.Second, httpClient))
-		})
-
 		It("should update ingress while sync failures occur on other ingresses", func() {
 			By("Creating ingresses that would fail on sync.")
 			ingFailTLSBackend := &extensions.Ingress{