diff --git a/test/e2e/framework/ingress/ingress_utils.go b/test/e2e/framework/ingress/ingress_utils.go index 0cb68dc4e9a..aca07541ead 100644 --- a/test/e2e/framework/ingress/ingress_utils.go +++ b/test/e2e/framework/ingress/ingress_utils.go @@ -86,6 +86,9 @@ const ( // IngressManifestPath is the parent path to yaml test manifests. IngressManifestPath = "test/e2e/testing-manifests/ingress" + // GCEIngressManifestPath is the parent path to GCE-specific yaml test manifests. + GCEIngressManifestPath = IngressManifestPath + "/gce" + // IngressReqTimeout is the timeout on a single http request. IngressReqTimeout = 10 * time.Second diff --git a/test/e2e/network/ingress.go b/test/e2e/network/ingress.go index 6a9a98b5485..9918272e763 100644 --- a/test/e2e/network/ingress.go +++ b/test/e2e/network/ingress.go @@ -889,7 +889,7 @@ var _ = SIGDescribe("Loadbalancing: L7", func() { It("single and multi-cluster ingresses should be able to exist together", func() { By("Creating a single cluster ingress first") jig.Class = "" - singleIngFilePath := filepath.Join(ingress.IngressManifestPath, "static-ip-2") + singleIngFilePath := filepath.Join(ingress.GCEIngressManifestPath, "static-ip-2") jig.CreateIngress(singleIngFilePath, ns, map[string]string{}, map[string]string{}) jig.WaitForIngress(false /*waitForNodePort*/) // jig.Ingress will be overwritten when we create MCI, so keep a reference. diff --git a/test/e2e/testing-manifests/ingress/static-ip-2/ing.yaml b/test/e2e/testing-manifests/ingress/gce/static-ip-2/ing.yaml similarity index 100% rename from test/e2e/testing-manifests/ingress/static-ip-2/ing.yaml rename to test/e2e/testing-manifests/ingress/gce/static-ip-2/ing.yaml diff --git a/test/e2e/testing-manifests/ingress/static-ip-2/rc.yaml b/test/e2e/testing-manifests/ingress/gce/static-ip-2/rc.yaml similarity index 100% rename from test/e2e/testing-manifests/ingress/static-ip-2/rc.yaml rename to test/e2e/testing-manifests/ingress/gce/static-ip-2/rc.yaml diff --git a/test/e2e/testing-manifests/ingress/static-ip-2/svc.yaml b/test/e2e/testing-manifests/ingress/gce/static-ip-2/svc.yaml similarity index 100% rename from test/e2e/testing-manifests/ingress/static-ip-2/svc.yaml rename to test/e2e/testing-manifests/ingress/gce/static-ip-2/svc.yaml diff --git a/test/e2e/upgrades/ingress.go b/test/e2e/upgrades/ingress.go index fbaacc3b7d3..a3198e1f408 100644 --- a/test/e2e/upgrades/ingress.go +++ b/test/e2e/upgrades/ingress.go @@ -94,10 +94,9 @@ func (t *IngressUpgradeTest) Setup(f *framework.Framework) { // Allocate a static-ip for the Ingress, this IP is cleaned up via CleanupGCEIngressController t.ipName = fmt.Sprintf("%s-static-ip", ns.Name) t.ip = t.gceController.CreateStaticIP(t.ipName) - // Create a working basic Ingress By(fmt.Sprintf("allocated static ip %v: %v through the GCE cloud provider", t.ipName, t.ip)) - jig.CreateIngress(filepath.Join(ingress.IngressManifestPath, "static-ip-2"), ns.Name, map[string]string{ + jig.CreateIngress(filepath.Join(ingress.GCEIngressManifestPath, "static-ip-2"), ns.Name, map[string]string{ ingress.IngressStaticIPKey: t.ipName, ingress.IngressAllowHTTPKey: "false", }, map[string]string{})