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

Merge pull request #32521 from kubernetes/revert-32420-e2e-teardown-on-up

Browse Source 
Automatic merge from submit-queue

Revert "e2e: only tear down existing cluster if it exists"

Reverts kubernetes/kubernetes#32420

This broke more things. We're going to backport the `|| true` fix to 1.2 -- doing just enough maintenance on old branches to keep upgrades working with new infra changes.
This commit is contained in:
Kubernetes Submit Queue 2016-09-12 21:06:28 -07:00 committed by GitHub
commit 07ebba8fd3
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/e2e.go
View File

@ -94,9 +94,7 @@ func main() {
}
}
// TODO: remove the IsUp() check after we stop testing 1.2 and earlier
// (or if we figure out a better way to handle TearDown failing on nonexisting clusters on old releases).
if *up && IsUp() {
if *up {
if err := TearDown(); err != nil {
log.Fatalf("error tearing down previous cluster: %v", err)
}