Merge pull request kubernetes#80276 from tallclair/apparmor-upgrade

k8s-ci-robot · web-flow · commit 2e6eea5517bc · 2019-07-20T05:56:54.000-07:00
Don't expect pod to stay up during node upgrade
diff --git a/test/e2e/upgrades/apparmor.go b/test/e2e/upgrades/apparmor.go
@@ -69,7 +69,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)

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func (t AppArmorUpgradeTest) Setup(f framework.Framework) {`
`69`	`69`	`// pod can still consume the secret.`
`70`	`70`	`func (t AppArmorUpgradeTest) Test(f framework.Framework, done <-chan struct{}, upgrade UpgradeType) {`
`71`	`71`	`<-done`
`72`		`- if upgrade == MasterUpgrade \|\| upgrade == ClusterUpgrade {`
	`72`	`+ if upgrade == MasterUpgrade {`
`73`	`73`	`t.verifyPodStillUp(f)`
`74`	`74`	`}`
`75`	`75`	`t.verifyNodesAppArmorEnabled(f)`