Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/machinery/config/types/runtime/unattended_install.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,11 @@ func (s ProvisioningSpec) IsZero() bool {
// Validate parses selector without mutating stored config.
func (s ProvisioningSpec) Validate() error {
if s.DiskSelector.Match.IsZero() {
return errors.New("provisioning.volumeSelector.match is required")
return errors.New("provisioning.diskSelector.match is required")
}

if err := s.DiskSelector.Match.ParseBool(celenv.DiskLocator()); err != nil {
return fmt.Errorf("provisioning.volumeSelector.match: %w", err)
return fmt.Errorf("provisioning.diskSelector.match: %w", err)
}

return nil
Expand Down
8 changes: 4 additions & 4 deletions pkg/machinery/config/types/runtime/unattended_install_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func TestUnattendedInstallValidate(t *testing.T) {
{
name: "empty",
cfg: runtime.NewUnattendedInstallConfigV1Alpha1,
expectedError: "provisioning.volumeSelector.match is required",
expectedError: "provisioning.diskSelector.match is required",
expectedWarnings: []string{
"installer.image is not set, if Talos is not booted from asset built by Image Factory, installation will fail",
},
Expand All @@ -108,14 +108,14 @@ func TestUnattendedInstallValidate(t *testing.T) {
},
},
{
name: "no volume selector match",
name: "no disk selector match",
cfg: func() *runtime.UnattendedInstallConfigV1Alpha1 {
cfg := runtime.NewUnattendedInstallConfigV1Alpha1()
cfg.Installer.Image = "factory.talos.dev/metal-installer/376567988ad370138ad8b2698212367b8edcb69b5fd68c80be1f2ec7d603b4ba:v1.0.0"

return cfg
},
expectedError: "provisioning.volumeSelector.match is required",
expectedError: "provisioning.diskSelector.match is required",
},
{
name: "invalid match expression",
Expand All @@ -131,7 +131,7 @@ func TestUnattendedInstallValidate(t *testing.T) {

return cfg
},
expectedError: "provisioning.volumeSelector.match: expression output type is int, expected bool",
expectedError: "provisioning.diskSelector.match: expression output type is int, expected bool",
},
{
name: "valid config",
Expand Down