From db0d364f395dd06ece8d4827d4ccfe67a5519d30 Mon Sep 17 00:00:00 2001 From: Arik Hadas Date: Mon, 25 Dec 2023 18:17:16 +0200 Subject: [PATCH] refactor openstack plan builder --- .../plan/adapter/openstack/builder.go | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkg/controller/plan/adapter/openstack/builder.go b/pkg/controller/plan/adapter/openstack/builder.go index 990478c0d..e36fa3afc 100644 --- a/pkg/controller/plan/adapter/openstack/builder.go +++ b/pkg/controller/plan/adapter/openstack/builder.go @@ -906,15 +906,15 @@ func (r *Builder) PopulatorVolumes(vmRef ref.Ref, annotations map[string]string, return } -func (r *Builder) getCorrespondingPvc(image model.Image, workload *model.Workload, vmRef ref.Ref, annotations map[string]string, secretName string) (*core.PersistentVolumeClaim, error) { - if populatorName, err := r.ensureVolumePopulator(workload, &image, secretName); err == nil { - return r.ensureVolumePopulatorPVC(workload, &image, annotations, populatorName) - } else { - return nil, err +func (r *Builder) getCorrespondingPvc(image model.Image, workload *model.Workload, vmRef ref.Ref, annotations map[string]string, secretName string) (pvc *core.PersistentVolumeClaim, err error) { + populatorCR, err := r.ensureVolumePopulator(workload, &image, secretName) + if err != nil { + return } + return r.ensureVolumePopulatorPVC(workload, &image, annotations, populatorCR.Name) } -func (r *Builder) ensureVolumePopulator(workload *model.Workload, image *model.Image, secretName string) (populatorName string, err error) { +func (r *Builder) ensureVolumePopulator(workload *model.Workload, image *model.Image, secretName string) (populatorCR *api.OpenstackVolumePopulator, err error) { volumePopulatorCR, err := r.getVolumePopulatorCR(image.Name) if err != nil { if !k8serr.IsNotFound(err) { @@ -923,7 +923,7 @@ func (r *Builder) ensureVolumePopulator(workload *model.Workload, image *model.I } return r.createVolumePopulatorCR(*image, secretName, workload.ID) } - populatorName = volumePopulatorCR.Name + populatorCR = &volumePopulatorCR return } @@ -995,8 +995,8 @@ func (r *Builder) getImagesFromVolumes(workload *model.Workload) (images []model return } -func (r *Builder) createVolumePopulatorCR(image model.Image, secretName, vmId string) (name string, err error) { - populatorCR := &api.OpenstackVolumePopulator{ +func (r *Builder) createVolumePopulatorCR(image model.Image, secretName, vmId string) (populatorCR *api.OpenstackVolumePopulator, err error) { + populatorCR = &api.OpenstackVolumePopulator{ ObjectMeta: meta.ObjectMeta{ Name: image.Name, Namespace: r.Plan.Spec.TargetNamespace, @@ -1014,7 +1014,6 @@ func (r *Builder) createVolumePopulatorCR(image model.Image, secretName, vmId st err = liberr.Wrap(err) return } - name = populatorCR.Name return }