Skip to content

Commit

Permalink
Merge pull request #50 from rabi/OSImage
Browse files Browse the repository at this point in the history
Drop webhook validation for OSImage
  • Loading branch information
openshift-merge-robot authored Jul 12, 2023
2 parents d4214e4 + 2cc93fd commit 02c7bec
Showing 1 changed file with 2 additions and 19 deletions.
21 changes: 2 additions & 19 deletions api/v1beta1/openstackbaremetalset_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func (r *OpenStackBaremetalSet) ValidateCreate() error {
return err
}

return r.validateCr()
return nil
}

// ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
Expand Down Expand Up @@ -149,7 +149,7 @@ func (r *OpenStackBaremetalSet) ValidateUpdate(old runtime.Object) error {
}
}

return r.validateCr()
return nil

}

Expand All @@ -159,20 +159,3 @@ func (r *OpenStackBaremetalSet) ValidateDelete() error {

return nil
}

func (r *OpenStackBaremetalSet) validateCr() error {
if err := r.checkBaseImageReqs(); err != nil {
return err
}

return nil
}

func (r *OpenStackBaremetalSet) checkBaseImageReqs() error {
// TODO(rabi): Uncomment after dataplane-operator api bump
// if r.Spec.OSImage == "" && r.Spec.ProvisionServerName == "" {
// return fmt.Errorf("either \"osImage\" or \"provisionServerName\" must be provided")
// }

return nil
}

0 comments on commit 02c7bec

Please sign in to comment.