Merge pull request #409 from anfredette/app-pending

Make the bpfman-operator report status of "Pending" instead of "Error" when appropriate

Author: mergify[bot]

controllers/bpfman-operator/common.go

@@ -130,6 +130,7 @@ func reconcileBpfApplication[T BpfProgOper, TL BpfProgListOper[T]](
 		}
 	}
 
+	pendingBpfApplications := []string{}
 	failedBpfApplications := []string{}
 	finalApplied := []string{}
 	// Make sure no BpfApplications had any issues in the loading or unloading process
@@ -142,6 +143,8 @@ func reconcileBpfApplication[T BpfProgOper, TL BpfProgListOper[T]](
 		status := bpfAppState.GetStatus()
 		if bpfmanHelpers.IsBpfAppStateConditionFailure(&status.Conditions) {
 			failedBpfApplications = append(failedBpfApplications, bpfAppState.GetName())
+		} else if bpfmanHelpers.IsBpfAppStateConditionPending(&status.Conditions) {
+			pendingBpfApplications = append(pendingBpfApplications, bpfAppState.GetName())
 		}
 	}
 
@@ -153,18 +156,17 @@ func reconcileBpfApplication[T BpfProgOper, TL BpfProgListOper[T]](
 			return r.removeFinalizer(ctx, app, internal.BpfmanOperatorFinalizer)
 		}
 
-		// Causes Requeue
 		return rec.updateStatus(ctx, appNamespace, appName, bpfmaniov1alpha1.BpfAppCondDeleteError,
 			fmt.Sprintf("Program Deletion failed on the following BpfApplicationState objects: %v", finalApplied))
 	}
 
 	if len(failedBpfApplications) != 0 {
-		// Causes Requeue
 		return rec.updateStatus(ctx, appNamespace, appName, bpfmaniov1alpha1.BpfAppCondError,
-			fmt.Sprintf("bpfProgramReconciliation failed on the following BpfApplicationState objects: %v", failedBpfApplications))
+			fmt.Sprintf("BpfApplication Reconciliation failed on the following BpfApplicationState objects: %v", failedBpfApplications))
+	} else if len(pendingBpfApplications) != 0 {
+		return rec.updateStatus(ctx, appNamespace, appName, bpfmaniov1alpha1.BpfAppCondPending,
+			fmt.Sprintf("BpfApplication Reconciliation is pending on the following BpfApplicationState objects: %v", pendingBpfApplications))
 	}
-
-	// Causes Requeue
 	return rec.updateStatus(ctx, appNamespace, appName, bpfmaniov1alpha1.BpfAppCondSuccess, "")
 }
 

controllers/bpfman-operator/configmap.go

@@ -86,9 +86,8 @@ func (r *BpfmanConfigReconciler) Reconcile(ctx context.Context, req ctrl.Request
 				r.Logger.Error(err, "failed adding bpfman-operator finalizer to bpfman config")
 				return ctrl.Result{Requeue: true, RequeueAfter: retryDurationOperator}, nil
 			}
-		} else {
-			return r.ReconcileBpfmanConfig(ctx, req, bpfmanConfig)
 		}
+		return r.ReconcileBpfmanConfig(ctx, req, bpfmanConfig)
 	}
 
 	return ctrl.Result{}, nil

pkg/helpers/helpers.go

@@ -154,7 +154,7 @@ func IsBpfmanDeployed() bool {
 	return false
 }
 
-func IsBpfApplicationConditionFailure(conditions *[]metav1.Condition) bool {
+func IsBpfAppStateConditionFailure(conditions *[]metav1.Condition) bool {
 	if conditions == nil || *conditions == nil || len(*conditions) == 0 {
 		return true
 	}
@@ -167,16 +167,12 @@ func IsBpfApplicationConditionFailure(conditions *[]metav1.Condition) bool {
 		log.Info("more than one condition found", "numConditions", numConditions)
 	}
 
-	if (*conditions)[0].Type == string(bpfmaniov1alpha1.BpfAppStateCondPending) ||
-		(*conditions)[0].Type == string(bpfmaniov1alpha1.BpfAppStateCondError) ||
-		(*conditions)[0].Type == string(bpfmaniov1alpha1.BpfAppStateCondProgramListChangedError) {
-		return true
-	}
-
-	return false
+	return (*conditions)[0].Type == string(bpfmaniov1alpha1.BpfAppStateCondError) ||
+		(*conditions)[0].Type == string(bpfmaniov1alpha1.BpfAppStateCondProgramListChangedError) ||
+		(*conditions)[0].Type == string(bpfmaniov1alpha1.BpfAppStateCondDeleteError)
 }
 
-func IsBpfAppStateConditionFailure(conditions *[]metav1.Condition) bool {
+func IsBpfAppStateConditionPending(conditions *[]metav1.Condition) bool {
 	if conditions == nil || *conditions == nil || len(*conditions) == 0 {
 		return true
 	}
@@ -189,9 +185,5 @@ func IsBpfAppStateConditionFailure(conditions *[]metav1.Condition) bool {
 		log.Info("more than one condition found", "numConditions", numConditions)
 	}
 
-	if (*conditions)[0].Type == string(bpfmaniov1alpha1.BpfAppCondSuccess) {
-		return false
-	} else {
-		return true
-	}
+	return (*conditions)[0].Type == string(bpfmaniov1alpha1.BpfAppCondPending)
 }