Skip to content

Commit

Permalink
Merge pull request openstack-k8s-operators#932 from rabi/error_msg
Browse files Browse the repository at this point in the history
Use the error message from deployment
  • Loading branch information
openshift-merge-bot[bot] authored Jun 12, 2024
2 parents f057a68 + 733bc81 commit eecc010
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions controllers/openstackdataplanenodeset_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,6 @@ func (r *OpenStackDataPlaneNodeSetReconciler) Reconcile(ctx context.Context, req
}
instance.Status.Conditions.MarkFalse(condition.DeploymentReadyCondition,
condition.ErrorReason, condition.SeverityError,
condition.DeploymentReadyErrorMessage,
deployErrorMsg)
}

Expand Down Expand Up @@ -498,8 +497,7 @@ func checkDeployment(helper *helper.Helper,
instance.Status.DeploymentStatuses[deployment.Name] = deploymentConditions
deploymentCondition := deploymentConditions.Get(dataplanev1.NodeSetDeploymentReadyCondition)
if condition.IsError(deploymentCondition) {
msg := strings.Replace(deploymentCondition.Message, strings.Split(condition.DeploymentReadyErrorMessage, "%")[0], "", -1)
err = fmt.Errorf(msg)
err = fmt.Errorf(deploymentCondition.Message)
isDeploymentFailed = true
break
} else if deploymentConditions.IsFalse(dataplanev1.NodeSetDeploymentReadyCondition) {
Expand Down

0 comments on commit eecc010

Please sign in to comment.