From adeb978243fcc274f41235729513466353d955d0 Mon Sep 17 00:00:00 2001 From: Rodolfo Pacheco Date: Wed, 28 Oct 2020 17:43:26 -0400 Subject: [PATCH] WIP: Pshing extrapolate again --- pkg/controllers/sipcluster_controller.go | 2 +- pkg/vbmh/errors.go | 2 +- pkg/vbmh/machines.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/controllers/sipcluster_controller.go b/pkg/controllers/sipcluster_controller.go index 8eb6779..d6d25aa 100644 --- a/pkg/controllers/sipcluster_controller.go +++ b/pkg/controllers/sipcluster_controller.go @@ -112,7 +112,7 @@ func (r *SIPClusterReconciler) gatherVM(sip airshipv1.SIPCluster) (error, *airsh // So that LB and Jump Host all leverage the same err = machines.Extrapolate(sip, r.Client) if err != nil { - return err, machines + return err, machines } return nil, machines diff --git a/pkg/vbmh/errors.go b/pkg/vbmh/errors.go index a713d8d..198fe30 100644 --- a/pkg/vbmh/errors.go +++ b/pkg/vbmh/errors.go @@ -30,4 +30,4 @@ type ErrorHostIpNotFound struct { func (e ErrorHostIpNotFound) Error() string { return fmt.Sprintf("Unable to identify the vBMH Host %v IP address on interface %v required by Infrastructure Service %v ", e.HostName, e.IPInterface, e.ServiceName) -} +} diff --git a/pkg/vbmh/machines.go b/pkg/vbmh/machines.go index f5d5c5a..72a32b4 100644 --- a/pkg/vbmh/machines.go +++ b/pkg/vbmh/machines.go @@ -250,7 +250,7 @@ func (ml *MachineList) scheduleIt(nodeRole airshipv1.VmRoles, nodeCfg airshipv1. // Extrapolate // The intention is to extract the IP information from the referenced networkData field for the BareMetalHost -func (ml *MachineList) Extrapolate(sip airshipv1.SIPCluster, c client.Client) error { +func (ml *MachineList) Extrapolate(sip airshipv1.SIPCluster, c client.Client) error { // Lets get the data for all selected BMH's. for _, machine := range ml.bmhs { bmh := machine.Bmh