Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move e2e ingress test manifests for GCE to a subdirectory #72092

Merged
merged 5 commits into from
Mar 13, 2019
Merged

Move e2e ingress test manifests for GCE to a subdirectory #72092

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab00560
Merge pull request #1 from kubernetes/master
vllry Dec 15, 2018
3d81b0b
Moved GCE-specific ingress test yaml to a ./gce directory. (#58640)
vllry Dec 16, 2018
3de7307
Merge branch 'master' into move-gce-test-manifests
vllry Mar 1, 2019
776ac93
Fix mispelled variable in ingress.go after rebase
vllry Mar 1, 2019
579764e
Tiny whitespace tweak in ingress.go
vllry Mar 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions test/e2e/framework/ingress/ingress_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/network/ingress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,7 +894,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.
Expand Down
0 ...ng-manifests/ingress/static-ip-2/ing.yaml → ...anifests/ingress/gce/static-ip-2/ing.yaml
View file
Open in desktop
File renamed without changes.
0 ...ing-manifests/ingress/static-ip-2/rc.yaml → ...manifests/ingress/gce/static-ip-2/rc.yaml
View file
Open in desktop
File renamed without changes.
0 ...ng-manifests/ingress/static-ip-2/svc.yaml → ...anifests/ingress/gce/static-ip-2/svc.yaml
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions test/e2e/upgrades/ingress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,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)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems unnecessary change here for readability.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

// Create a working basic Ingress
ginkgo.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{})
Expand Down