Merge pull request #80988 from tallclair/automated-cherry-pick-of-#80276-upstream-release-1.14

Automated cherry pick of #80276: Don't expect pod to stay up during node upgrade

Merge pull request #80988 from tallclair/automated-cherry-pick-of-#80276-upstream-release-1.14
314053a6 · Kubernetes Prow Robot · GitHub · 520865cc · 9ba59142 · 314053a6
Unverified Commit 314053a6 authored Aug 15, 2019 by Kubernetes Prow Robot Committed by GitHub Aug 15, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

apparmor.go test/e2e/upgrades/apparmor.go +1 -1

No files found.
--- a/test/e2e/upgrades/apparmor.go
+++ b/test/e2e/upgrades/apparmor.go
@@ -68,7 +68,7 @@ func (t *AppArmorUpgradeTest) Setup(f *framework.Framework) {
 // pod can still consume the secret.
 func (t *AppArmorUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade UpgradeType) {
 	<-done
-	if upgrade == MasterUpgrade || upgrade == ClusterUpgrade {
+	if upgrade == MasterUpgrade {
 		t.verifyPodStillUp(f)
 	}
 	t.verifyNodesAppArmorEnabled(f)