Skip to content

K
k3s
Unverified Commit 54fe9e13 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

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
parents 93d6c590 14dda3f1
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
test/e2e/upgrades/apparmor.go
View file @ 54fe9e13
...@@ -69,7 +69,7 @@ func (t *AppArmorUpgradeTest) Setup(f *framework.Framework) { ...@@ -69,7 +69,7 @@ func (t *AppArmorUpgradeTest) Setup(f *framework.Framework) {
// pod can still consume the secret. // pod can still consume the secret.
func (t *AppArmorUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade UpgradeType) { func (t *AppArmorUpgradeTest) Test(f *framework.Framework, done <-chan struct{}, upgrade UpgradeType) {
<-done <-done
if upgrade == MasterUpgrade || upgrade == ClusterUpgrade { if upgrade == MasterUpgrade {
t.verifyPodStillUp(f) t.verifyPodStillUp(f)
} }
t.verifyNodesAppArmorEnabled(f) t.verifyNodesAppArmorEnabled(f)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment