github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36619 from MrHohn/e2e-down-listresources

Browse Source 
Automatic merge from submit-queue

ListResources before bring down the cluster

From #31827.

We already list GCP resources [before bring up the cluster](https://storage.googleapis.com/kubernetes-jenkins/logs/kubernetes-e2e-gci-gce/2718/artifacts/gcp-resources-before.txt), [after bring up the cluster](https://storage.googleapis.com/kubernetes-jenkins/logs/kubernetes-e2e-gci-gce/2718/artifacts/gcp-resources-cluster-up.txt) and[ after bring down the cluster](https://storage.googleapis.com/kubernetes-jenkins/logs/kubernetes-e2e-gci-gce/2718/artifacts/gcp-resources-after.txt). This PR also lists GCP resources before bring down the cluster. It will be helpful for checking whether everything is still as expected. Specifically we could know whether the firewall rules got clobbered or not.

@bowei @bprashanth
This commit is contained in:
Kubernetes Submit Queue 2016-11-30 08:03:27 -08:00 committed by GitHub
commit 5f705d5724
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hack/e2e.go
View File

@ -213,6 +213,7 @@ func run(deploy deployer) error {
var (
beforeResources []byte
upResources []byte
downResources []byte
afterResources []byte
)
@ -293,6 +294,13 @@ func run(deploy deployer) error {
}))
}
if *checkLeakedResources {
errs = appendError(errs, xmlWrap("ListResources Down", func() error {
downResources, err = ListResources()
return err
}))
}
if *down {
errs = appendError(errs, xmlWrap("TearDown", deploy.Down))
}
@ -307,7 +315,7 @@ func run(deploy deployer) error {
errs = append(errs, err)
} else {
errs = appendError(errs, xmlWrap("DiffResources", func() error {
return DiffResources(beforeResources, upResources, afterResources, *dump)
return DiffResources(beforeResources, upResources, downResources, afterResources, *dump)
}))
}
}
@ -318,7 +326,7 @@ func run(deploy deployer) error {
return nil
}
func DiffResources(before, clusterUp, after []byte, location string) error {
func DiffResources(before, clusterUp, clusterDown, after []byte, location string) error {
if location == "" {
var err error
location, err = ioutil.TempDir("", "e2e-check-resources")
@ -330,6 +338,7 @@ func DiffResources(before, clusterUp, after []byte, location string) error {
var mode os.FileMode = 0664
bp := filepath.Join(location, "gcp-resources-before.txt")
up := filepath.Join(location, "gcp-resources-cluster-up.txt")
cdp := filepath.Join(location, "gcp-resources-cluster-down.txt")
ap := filepath.Join(location, "gcp-resources-after.txt")
dp := filepath.Join(location, "gcp-resources-diff.txt")
@ -339,6 +348,9 @@ func DiffResources(before, clusterUp, after []byte, location string) error {
if err := ioutil.WriteFile(up, clusterUp, mode); err != nil {
return err
}
if err := ioutil.WriteFile(cdp, clusterDown, mode); err != nil {
return err
}
if err := ioutil.WriteFile(ap, after, mode); err != nil {
return err
}