diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 42f69dfdd..cb3151cbe 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -15,12 +15,16 @@ # Coulombel Florian (coulof) # Deepak Ghivari (Deepak-Ghivari) # Gallacher Sean (gallacher) +# Gil Taran (gilltaran) +# Harish P (harishp8889) # Harish H (HarishH-DELL) # Jacob Grosner (JacobGros) # Jooseppi Luna (jooseppi-luna) # Karthik K (karthikk92) # Kumar Karthik Gosa (kumarkgosa) # Keerthi Bandapati (bandak2) +# Meghana M (meggm) +# Mukesh Gandharva (mgandharva) # Matt Schmaelzle (mjsdell) # Nitesh Rewatkar (nitesh3108) # Prabhu Revur (prabhu-dell) @@ -35,4 +39,4 @@ # Yamunadevi N Shanmugam (shanmydell) # for all files: -* @abhi16394 @mbasha-dell @alikdell @bharathsreekanth @chimanjain @coulof @Deepak-Ghivari @gallacher @HarishH-DELL @JacobGros @jooseppi-luna @karthikk92 @kumarkgosa @bandak2 @mjsdell @nitesh3108 @prabhu-dell @rajendraindukuri @rajkumar-palani @shefali-malhotra @panigs7 @tdawe @shaynafinocchiaro @atye @sharmilarama @shanmydell +* @abhi16394 @mbasha-dell @alikdell @bharathsreekanth @chimanjain @coulof @Deepak-Ghivari @gallacher @gilltaran @harishp8889 @HarishH-DELL @JacobGros @jooseppi-luna @karthikk92 @kumarkgosa @bandak2 @meggm @mgandharva @mjsdell @nitesh3108 @prabhu-dell @rajendraindukuri @rajkumar-palani @shefali-malhotra @panigs7 @tdawe @shaynafinocchiaro @atye @sharmilarama @shanmydell diff --git a/pkg/drivers/powermax.go b/pkg/drivers/powermax.go index 81b90feff..da721ab3b 100644 --- a/pkg/drivers/powermax.go +++ b/pkg/drivers/powermax.go @@ -94,6 +94,17 @@ func PrecheckPowerMax(ctx context.Context, cr *csmv1.ContainerStorageModule, ope Value: "/var/lib/kubelet", }) } + if cr.Spec.Modules == nil { + // this means it's a minimal yaml and we will append reverse-proxy by default + modules := make([]csmv1.Module, 0) + modules = append(modules, csmv1.Module{ + Name: "csireverseproxy", + Enabled: true, + ConfigVersion: "v2.10.0", + ForceRemoveModule: true, + }) + cr.Spec.Modules = modules + } foundRevProxy := false for _, mod := range cr.Spec.Modules { if mod.Name == csmv1.ReverseProxy { @@ -102,7 +113,13 @@ func PrecheckPowerMax(ctx context.Context, cr *csmv1.ContainerStorageModule, ope } } if !foundRevProxy { - return fmt.Errorf("failed to find reverseproxy module") + log.Infof("Reverse proxy module not found adding it with default config") + cr.Spec.Modules = append(cr.Spec.Modules, csmv1.Module{ + Name: "csireverseproxy", + Enabled: true, + ConfigVersion: "v2.10.0", + ForceRemoveModule: true, + }) } log.Debugw("preCheck", "secrets", cred) diff --git a/pkg/drivers/powermax_test.go b/pkg/drivers/powermax_test.go index 863693f61..88b6e3478 100644 --- a/pkg/drivers/powermax_test.go +++ b/pkg/drivers/powermax_test.go @@ -45,7 +45,7 @@ var ( expectedErr string }{ {"happy path", powerMaxCSM, powerMaxClient, powerMaxSecret, ""}, - {"no proxy", powerMaxCSMNoProxy, powerMaxClient, powerMaxSecret, "failed to find reverseproxy module"}, + {"no proxy set defaults", powerMaxCSMNoProxy, powerMaxClient, powerMaxSecret, ""}, } preCheckpowerMaxTest = []struct { diff --git a/samples/minimal-samples/powermax.yaml b/samples/minimal-samples/powermax.yaml index bc3c077ea..3faca3e15 100644 --- a/samples/minimal-samples/powermax.yaml +++ b/samples/minimal-samples/powermax.yaml @@ -7,7 +7,3 @@ spec: driver: csiDriverType: "powermax" configVersion: v2.12.0 - modules: - - name: csireverseproxy - enabled: true - configVersion: v2.10.0