alt-orchestra/talos
1
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases Wiki Activity

fix: prevent panic in validate config if machine.install is missing

Browse Source 
Fixes #3382

Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
This commit is contained in:
Andrey Smirnov 2021-03-26 23:54:43 +03:00 committed by talos-bot
parent d7e9f6d6a8
commit 4b3580aa57
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/machinery/config/types/v1alpha1/v1alpha1_validation.go
View File

@ -73,24 +73,24 @@ func (c *Config) Validate(mode config.RuntimeMode, options ...config.ValidationO
if mode.RequiresInstall() {
if c.MachineConfig.MachineInstall == nil {
result = multierror.Append(result, fmt.Errorf("install instructions are required in %q mode", mode))
}
if opts.Local {
if c.MachineConfig.MachineInstall.InstallDisk == "" && len(c.MachineConfig.MachineInstall.DiskMatchers()) == 0 {
result = multierror.Append(result, fmt.Errorf("either install disk or diskSelector should be defined"))
}
} else {
disk, err := c.MachineConfig.MachineInstall.Disk()
if err != nil {
result = multierror.Append(result, err)
} else {
if disk == "" {
result = multierror.Append(result, fmt.Errorf("an install disk is required in %q mode", mode))
if opts.Local {
if c.MachineConfig.MachineInstall.InstallDisk == "" && len(c.MachineConfig.MachineInstall.DiskMatchers()) == 0 {
result = multierror.Append(result, fmt.Errorf("either install disk or diskSelector should be defined"))
}
} else {
disk, err := c.MachineConfig.MachineInstall.Disk()
if _, err := os.Stat(disk); os.IsNotExist(err) {
result = multierror.Append(result, fmt.Errorf("specified install disk does not exist: %q", c.MachineConfig.MachineInstall.InstallDisk))
if err != nil {
result = multierror.Append(result, err)
} else {
if disk == "" {
result = multierror.Append(result, fmt.Errorf("an install disk is required in %q mode", mode))
}
if _, err := os.Stat(disk); os.IsNotExist(err) {
result = multierror.Append(result, fmt.Errorf("specified install disk does not exist: %q", c.MachineConfig.MachineInstall.InstallDisk))
}
}
}
}