Skip to content

Bug 1805025: validate that image exists before creating a machine #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Sep 17, 2020
Merged

Bug 1805025: validate that image exists before creating a machine #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions pkg/cloud/openstack/clients/machineservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,6 +905,16 @@ func (is *InstanceService) DoesFlavorExist(flavorName string) error {
return nil
}

// DoesImageExist return an error if image with the given name doesn't exist, and nil otherwise
func (is *InstanceService) DoesImageExist(imageName string) error {
_, err := getImageID(is, imageName)
if err != nil {
return err
}

return nil
}

func (is *InstanceService) GetInstance(resourceId string) (instance *Instance, err error) {
if resourceId == "" {
return nil, fmt.Errorf("ResourceId should be specified to get detail.")
Expand Down
8 changes: 7 additions & 1 deletion pkg/cloud/openstack/machine/actuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,10 +675,16 @@ func (oc *OpenstackClient) validateMachine(machine *machinev1.Machine) error {

// TODO(mfedosin): add more validations here

// Validate that image exists
err = machineService.DoesImageExist(machineSpec.Image)
if err != nil {
return err
}

// Validate that flavor exists
err = machineService.DoesFlavorExist(machineSpec.Flavor)
if err != nil {
return fmt.Errorf("Can't find a flavor with name %v: %v", machineSpec.Flavor, err)
return err
}

return nil
Expand Down