From ca07ba3c060ce5d819d3e608debda3ab3db97601 Mon Sep 17 00:00:00 2001 From: Iury Gregory Melo Ferreira Date: Tue, 9 Jul 2024 08:36:37 -0300 Subject: [PATCH] Use OwnerReference for HostFirmwareComponents We shouldn't set controller reference for HostFirmwareComponents, since they are to solve a problem with ReplicaSet and Pod that doesn't exist here, see [1] [1] https://github.com/kubernetes/design-proposals-archive/blob/acc25e14ca83dfda4f66d8cb1f1b491f26e78ffe/api-machinery/controller-ref.md Signed-off-by: Iury Gregory Melo Ferreira --- controllers/metal3.io/baremetalhost_controller.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/controllers/metal3.io/baremetalhost_controller.go b/controllers/metal3.io/baremetalhost_controller.go index a779aa7724..2971a680db 100644 --- a/controllers/metal3.io/baremetalhost_controller.go +++ b/controllers/metal3.io/baremetalhost_controller.go @@ -1794,8 +1794,8 @@ func (r *BareMetalHostReconciler) createHostFirmwareComponents(info *reconcileIn Updates: []metal3api.FirmwareUpdate{}} // Set bmh as owner, this makes sure the resource is deleted when bmh is deleted - if err = controllerutil.SetControllerReference(info.host, hfc, r.Scheme()); err != nil { - return errors.Wrap(err, "could not set bmh as controller for hostFirmwareComponents") + if err = controllerutil.SetOwnerReference(info.host, hfc, r.Scheme()); err != nil { + return errors.Wrap(err, "could not set bmh as owner for hostFirmwareComponents") } if err = r.Create(info.ctx, hfc); err != nil { return errors.Wrap(err, "failure creating hostFirmwareComponents resource") @@ -1810,8 +1810,8 @@ func (r *BareMetalHostReconciler) createHostFirmwareComponents(info *reconcileIn // Necessary in case the CRD is created manually. if !ownerReferenceExists(info.host, hfc) { - if err := controllerutil.SetControllerReference(info.host, hfc, r.Scheme()); err != nil { - return errors.Wrap(err, "could not set bmh as controller for hostFirmwareComponents") + if err := controllerutil.SetOwnerReference(info.host, hfc, r.Scheme()); err != nil { + return errors.Wrap(err, "could not set bmh as owner for hostFirmwareComponents") } if err := r.Update(info.ctx, hfc); err != nil { return errors.Wrap(err, "failure updating hostFirmwareComponents resource")