github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #80989 from tallclair/automated-cherry-pick-of-#80276-upstream-release-1.15 

Automated cherry pick of #80276: Don't expect pod to stay up during node upgrade
k3s-v1.15.3
Kubernetes Prow Robot 2019-08-06 22:47:25 -07:00 committed by GitHub
parent 93d6c59069 14dda3f199
commit 54fe9e139d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/upgrades/apparmor.go
View File

@ -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)