github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #43254 from krousey/upgrades

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 43254, 43255, 43184, 42509)

Fix nil-map panic in AppArmor skip
This commit is contained in:
Kubernetes Submit Queue 2017-03-16 19:02:19 -07:00 committed by GitHub
commit 18582a611a
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

@ -35,7 +35,7 @@ type AppArmorUpgradeTest struct {
func (AppArmorUpgradeTest) Name() string { return "apparmor-upgrade" } func (AppArmorUpgradeTest) Name() string { return "apparmor-upgrade" }
func (AppArmorUpgradeTest) Skip(upgCtx UpgradeContext) bool { func (AppArmorUpgradeTest) Skip(upgCtx UpgradeContext) bool {
var supportedImages map[string]bool supportedImages := make(map[string]bool)
for _, d := range common.AppArmorDistros { for _, d := range common.AppArmorDistros {
supportedImages[d] = true supportedImages[d] = true
} }