github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Don't leak stati-ips in ingress e2es

Browse Source
This commit is contained in:
Prashanth Balasubramanian 2016-06-17 10:35:16 -07:00
parent 926ff6e3fd
commit dafe27617e
1 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
test/e2e/ingress.go
View File

@ -56,6 +56,9 @@ const (
// On average it takes ~6 minutes for a single backend to come online in GCE. // On average it takes ~6 minutes for a single backend to come online in GCE.
lbPollTimeout = 15 * time.Minute lbPollTimeout = 15 * time.Minute
// General cloud resource poll timeout (eg: create static ip, firewall etc)
cloudResourcePollTimeout = 5 * time.Minute
// Time required by the loadbalancer to cleanup, proportional to numApps/Ing. // Time required by the loadbalancer to cleanup, proportional to numApps/Ing.
lbCleanupTimeout = 5 * time.Minute lbCleanupTimeout = 5 * time.Minute
lbPollInterval = 30 * time.Second lbPollInterval = 30 * time.Second
@ -442,8 +445,8 @@ func ingFromManifest(fileName string) *extensions.Ingress {
return &ing return &ing
} }
// gcloudUnmarshal unmarshals json output of gcloud into given out interface. // gcloudList unmarshals json output of gcloud into given out interface.
func gcloudUnmarshal(resource, regex, project string, out interface{}) { func gcloudList(resource, regex, project string, out interface{}) {
// gcloud prints a message to stderr if it has an available update // gcloud prints a message to stderr if it has an available update
// so we only look at stdout. // so we only look at stdout.
command := []string{ command := []string{
@ -475,6 +478,16 @@ func gcloudDelete(resource, name, project string, args ...string) error {
return err return err
} }
func gcloudCreate(resource, name, project string, args ...string) error {
framework.Logf("Creating %v in project %v: %v", resource, project, name)
argsList := append([]string{"compute", resource, "create", name, fmt.Sprintf("--project=%v", project)}, args...)
output, err := exec.Command("gcloud", argsList...).CombinedOutput()
if err != nil {
framework.Logf("Error creating %v, output: %v\nerror: %+v", resource, string(output), err)
}
return err
}
// GCEIngressController manages implementation details of Ingress on GCE/GKE. // GCEIngressController manages implementation details of Ingress on GCE/GKE.
type GCEIngressController struct { type GCEIngressController struct {
ns string ns string
@ -513,14 +526,20 @@ func (cont *GCEIngressController) init() {
} }
func (cont *GCEIngressController) staticIP(name string) string { func (cont *GCEIngressController) staticIP(name string) string {
output, err := exec.Command("gcloud", "compute", "addresses", "create", name, "--global").CombinedOutput() ExpectNoError(gcloudCreate("addresses", name, cont.Project, "--global"))
framework.Logf(string(output))
ExpectNoError(err)
cont.staticIPName = name cont.staticIPName = name
ipList := []compute.Address{} ipList := []compute.Address{}
gcloudUnmarshal("addresses", name, cont.Project, &ipList) if pollErr := wait.PollImmediate(5*time.Second, cloudResourcePollTimeout, func() (bool, error) {
if len(ipList) != 1 { gcloudList("addresses", name, cont.Project, &ipList)
if len(ipList) != 1 {
framework.Logf("Failed to find static ip %v even though create call succeeded, found ips %+v", name, ipList)
return false, nil
}
return true, nil
}); pollErr != nil {
if err := gcloudDelete("addresses", name, cont.Project, "--global"); err == nil {
framework.Logf("Failed to get AND delete address %v even though create call succeeded", name)
}
framework.Failf("Failed to find static ip %v even though create call succeeded, found ips %+v", name, ipList) framework.Failf("Failed to find static ip %v even though create call succeeded, found ips %+v", name, ipList)
} }
return ipList[0].Address return ipList[0].Address
@ -536,7 +555,7 @@ func (cont *GCEIngressController) Cleanup(del bool) error {
// resources hold references to. // resources hold references to.
fwList := []compute.ForwardingRule{} fwList := []compute.ForwardingRule{}
for _, regex := range []string{fmt.Sprintf("k8s-fw-.*--%v", cont.UID), fmt.Sprintf("k8s-fws-.*--%v", cont.UID)} { for _, regex := range []string{fmt.Sprintf("k8s-fw-.*--%v", cont.UID), fmt.Sprintf("k8s-fws-.*--%v", cont.UID)} {
gcloudUnmarshal("forwarding-rules", regex, cont.Project, &fwList) gcloudList("forwarding-rules", regex, cont.Project, &fwList)
if len(fwList) != 0 { if len(fwList) != 0 {
msg := "" msg := ""
for _, f := range fwList { for _, f := range fwList {
@ -550,7 +569,7 @@ func (cont *GCEIngressController) Cleanup(del bool) error {
} }
// Static IPs are named after forwarding rules. // Static IPs are named after forwarding rules.
ipList := []compute.Address{} ipList := []compute.Address{}
gcloudUnmarshal("addresses", fmt.Sprintf("k8s-fw-.*--%v", cont.UID), cont.Project, &ipList) gcloudList("addresses", fmt.Sprintf("k8s-fw-.*--%v", cont.UID), cont.Project, &ipList)
if len(ipList) != 0 { if len(ipList) != 0 {
msg := "" msg := ""
for _, ip := range ipList { for _, ip := range ipList {
@ -570,7 +589,7 @@ func (cont *GCEIngressController) Cleanup(del bool) error {
} }
tpList := []compute.TargetHttpProxy{} tpList := []compute.TargetHttpProxy{}
gcloudUnmarshal("target-http-proxies", fmt.Sprintf("k8s-tp-.*--%v", cont.UID), cont.Project, &tpList) gcloudList("target-http-proxies", fmt.Sprintf("k8s-tp-.*--%v", cont.UID), cont.Project, &tpList)
if len(tpList) != 0 { if len(tpList) != 0 {
msg := "" msg := ""
for _, t := range tpList { for _, t := range tpList {
@ -582,7 +601,7 @@ func (cont *GCEIngressController) Cleanup(del bool) error {
errMsg += fmt.Sprintf("Found target proxies:\n%v", msg) errMsg += fmt.Sprintf("Found target proxies:\n%v", msg)
} }
tpsList := []compute.TargetHttpsProxy{} tpsList := []compute.TargetHttpsProxy{}
gcloudUnmarshal("target-https-proxies", fmt.Sprintf("k8s-tps-.*--%v", cont.UID), cont.Project, &tpsList) gcloudList("target-https-proxies", fmt.Sprintf("k8s-tps-.*--%v", cont.UID), cont.Project, &tpsList)
if len(tpsList) != 0 { if len(tpsList) != 0 {
msg := "" msg := ""
for _, t := range tpsList { for _, t := range tpsList {
@ -596,7 +615,7 @@ func (cont *GCEIngressController) Cleanup(del bool) error {
// TODO: Check for leaked ssl certs. // TODO: Check for leaked ssl certs.
umList := []compute.UrlMap{} umList := []compute.UrlMap{}
gcloudUnmarshal("url-maps", fmt.Sprintf("k8s-um-.*--%v", cont.UID), cont.Project, &umList) gcloudList("url-maps", fmt.Sprintf("k8s-um-.*--%v", cont.UID), cont.Project, &umList)
if len(umList) != 0 { if len(umList) != 0 {
msg := "" msg := ""
for _, u := range umList { for _, u := range umList {
@ -609,7 +628,7 @@ func (cont *GCEIngressController) Cleanup(del bool) error {
} }
beList := []compute.BackendService{} beList := []compute.BackendService{}
gcloudUnmarshal("backend-services", fmt.Sprintf("k8s-be-[0-9]+--%v", cont.UID), cont.Project, &beList) gcloudList("backend-services", fmt.Sprintf("k8s-be-[0-9]+--%v", cont.UID), cont.Project, &beList)
if len(beList) != 0 { if len(beList) != 0 {
msg := "" msg := ""
for _, b := range beList { for _, b := range beList {
@ -622,7 +641,7 @@ func (cont *GCEIngressController) Cleanup(del bool) error {
} }
hcList := []compute.HttpHealthCheck{} hcList := []compute.HttpHealthCheck{}
gcloudUnmarshal("http-health-checks", fmt.Sprintf("k8s-be-[0-9]+--%v", cont.UID), cont.Project, &hcList) gcloudList("http-health-checks", fmt.Sprintf("k8s-be-[0-9]+--%v", cont.UID), cont.Project, &hcList)
if len(hcList) != 0 { if len(hcList) != 0 {
msg := "" msg := ""
for _, h := range hcList { for _, h := range hcList {