Merge pull request #32521 from kubernetes/revert-32420-e2e-teardown-on-up
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:
		@@ -94,9 +94,7 @@ func main() {
 | 
				
			|||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// TODO: remove the IsUp() check after we stop testing 1.2 and earlier
 | 
						if *up {
 | 
				
			||||||
	// (or if we figure out a better way to handle TearDown failing on nonexisting clusters on old releases).
 | 
					 | 
				
			||||||
	if *up && IsUp() {
 | 
					 | 
				
			||||||
		if err := TearDown(); err != nil {
 | 
							if err := TearDown(); err != nil {
 | 
				
			||||||
			log.Fatalf("error tearing down previous cluster: %v", err)
 | 
								log.Fatalf("error tearing down previous cluster: %v", err)
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user