Commit 18582a61 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #43254 from krousey/upgrades

Automatic merge from submit-queue (batch tested with PRs 43254, 43255, 43184, 42509) Fix nil-map panic in AppArmor skip
parents a10c8f49 7ccca441
...@@ -35,7 +35,7 @@ type AppArmorUpgradeTest struct { ...@@ -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
} }
......
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