From 31233b3c8f345678e192d3b4856baa2d0d267103 Mon Sep 17 00:00:00 2001 From: rabi Date: Tue, 14 Oct 2025 17:10:02 +0530 Subject: [PATCH] Allow updating nodeset inventory with failed deployment status This way new deployments can use updated inventory and as we ignore earlier failed deployments with overall deployment status, users don't have to delete the failed deployments. Jira: https://issues.redhat.com/browse/OSPRH-20821 Signed-off-by: rabi --- .../dataplane/openstackdataplanenodeset_controller.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/controllers/dataplane/openstackdataplanenodeset_controller.go b/controllers/dataplane/openstackdataplanenodeset_controller.go index fee1c99ace..9a4389e4c4 100644 --- a/controllers/dataplane/openstackdataplanenodeset_controller.go +++ b/controllers/dataplane/openstackdataplanenodeset_controller.go @@ -403,20 +403,20 @@ func (r *OpenStackDataPlaneNodeSetReconciler) Reconcile(ctx context.Context, req return ctrl.Result{}, err } - if !isDeploymentRunning && !isDeploymentFailed { + if !isDeploymentRunning { // Generate NodeSet Inventory - _, err = deployment.GenerateNodeSetInventory(ctx, helper, instance, + _, errInventory := deployment.GenerateNodeSetInventory(ctx, helper, instance, allIPSets, dnsDetails.ServerAddresses, containerImages, netServiceNetMap) - if err != nil { + if errInventory != nil { errorMsg := fmt.Sprintf("Unable to generate inventory for %s", instance.Name) - util.LogErrorForObject(helper, err, errorMsg, instance) + util.LogErrorForObject(helper, errInventory, errorMsg, instance) instance.Status.Conditions.MarkFalse( dataplanev1.SetupReadyCondition, condition.ErrorReason, condition.SeverityError, dataplanev1.DataPlaneNodeSetErrorMessage, errorMsg) - return ctrl.Result{}, err + return ctrl.Result{}, errInventory } } // all setup tasks complete, mark SetupReadyCondition True