Merge pull request #35798 from bprashanth/ing_test

Automatic merge from submit-queue Clean up static-ip in e2e I dropped this line: https://github.com/kubernetes/kubernetes/pull/35331/files#diff-5997d488011ead8354bdddfceaf1515dL595, in a previous refactor https://github.com/kubernetes/kubernetes/pull/35331, so we started leaking static ips. This commit adds it back in, along with some debug info if it happens again. Marking p2 since test is currently leaking.

Merge pull request #35798 from bprashanth/ing_test
0e46a5b2 · Kubernetes Submit Queue · GitHub · 9a219eb8 · 7cde81b5 · 0e46a5b2
Commit 0e46a5b2 authored Oct 29, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 29, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

ingress_utils.go test/e2e/ingress_utils.go +10 -0

No files found.
--- a/test/e2e/ingress_utils.go
+++ b/test/e2e/ingress_utils.go
@@ -359,6 +359,14 @@ func (cont *GCEIngressController) deleteAddresses(del bool) string {
 		if err := gcloudDelete("addresses", cont.staticIPName, cont.cloud.ProjectID, "--global"); err == nil {
 			cont.staticIPName = ""
 		}
+	} else {
+		e2eIPs := []compute.Address{}
+		gcloudList("addresses", "e2e-.*", cont.cloud.ProjectID, &e2eIPs)
+		ips := []string{}
+		for _, ip := range e2eIPs {
+			ips = append(ips, ip.Name)
+		}
+		framework.Logf("None of the remaining %d static-ips were created by this e2e: %v", len(ips), strings.Join(ips, ", "))
 	}
 	return msg
 }
@@ -605,6 +613,8 @@ func (cont *GCEIngressController) staticIP(name string) string {
 		}
 		framework.Failf("Failed to allocated static ip %v: %v", name, err)
 	}
+	cont.staticIPName = ip.Name
+	framework.Logf("Reserved static ip %v: %v", cont.staticIPName, ip.Address)
 	return ip.Address
 }