fix(operatorconditions): don't retry on 404 (#2679)

The controllers managing OperatorConditions can churn indefinitely, periodically
producing error logs, when a CSV is deleted. To prevent this, don't
retry when presented with select NOT_FOUND errors during reconciliation.

Signed-off-by: Nick Hale <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 0b77ba363dda9d4fe71218d514c290f4570b176b

Author: njhale

staging/operator-lifecycle-manager/pkg/controller/operators/operatorcondition_controller.go

@@ -93,39 +93,34 @@ var _ reconcile.Reconciler = &OperatorConditionReconciler{}
 
 func (r *OperatorConditionReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	// Set up a convenient log object so we don't have to type request over and over again
-	log := r.log.WithValues("request", req)
-	log.V(2).Info("reconciling operatorcondition")
+	log := r.log.WithValues("request", req).V(1)
+	log.Info("reconciling")
 	metrics.EmitOperatorConditionReconcile(req.Namespace, req.Name)
 
 	operatorCondition := &operatorsv2.OperatorCondition{}
-	err := r.Client.Get(context.TODO(), req.NamespacedName, operatorCondition)
-	if err != nil {
-		log.V(1).Error(err, "Unable to find operatorcondition")
-		return ctrl.Result{}, err
+	if err := r.Client.Get(ctx, req.NamespacedName, operatorCondition); err != nil {
+		log.Info("Unable to find OperatorCondition")
+		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
-	err = r.ensureOperatorConditionRole(operatorCondition)
-	if err != nil {
-		log.V(1).Error(err, "Error ensuring OperatorCondition Role")
-		return ctrl.Result{Requeue: true}, err
+	if err := r.ensureOperatorConditionRole(operatorCondition); err != nil {
+		log.Info("Error ensuring OperatorCondition Role")
+		return ctrl.Result{}, err
 	}
 
-	err = r.ensureOperatorConditionRoleBinding(operatorCondition)
-	if err != nil {
-		log.V(1).Error(err, "Error ensuring OperatorCondition RoleBinding")
-		return ctrl.Result{Requeue: true}, err
+	if err := r.ensureOperatorConditionRoleBinding(operatorCondition); err != nil {
+		log.Info("Error ensuring OperatorCondition RoleBinding")
+		return ctrl.Result{}, err
 	}
 
-	err = r.ensureDeploymentEnvVars(operatorCondition)
-	if err != nil {
-		log.V(1).Error(err, "Error ensuring OperatorCondition Deployment EnvVars")
-		return ctrl.Result{Requeue: true}, err
+	if err := r.ensureDeploymentEnvVars(operatorCondition); err != nil {
+		log.Info("Error ensuring OperatorCondition Deployment EnvVars")
+		return ctrl.Result{}, err
 	}
 
-	err = r.syncOperatorConditionStatus(operatorCondition)
-	if err != nil {
-		log.V(1).Error(err, "Error syncing OperatorCondition Status")
-		return ctrl.Result{Requeue: true}, err
+	if err := r.syncOperatorConditionStatus(operatorCondition); err != nil {
+		log.Info("Error syncing OperatorCondition Status")
+		return ctrl.Result{}, err
 	}
 
 	return ctrl.Result{}, nil

staging/operator-lifecycle-manager/pkg/controller/operators/operatorconditiongenerator_controller.go

@@ -90,14 +90,13 @@ var _ reconcile.Reconciler = &OperatorConditionGeneratorReconciler{}
 
 func (r *OperatorConditionGeneratorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	// Set up a convenient log object so we don't have to type request over and over again
-	log := r.log.WithValues("request", req)
+	log := r.log.WithValues("request", req).V(1)
 	metrics.EmitOperatorConditionGeneratorReconcile(req.Namespace, req.Name)
 
 	in := &operatorsv1alpha1.ClusterServiceVersion{}
-	err := r.Client.Get(context.TODO(), req.NamespacedName, in)
-	if err != nil {
-		log.V(1).Error(err, "Unable to find ClusterServiceVersion")
-		return ctrl.Result{}, err
+	if err := r.Client.Get(ctx, req.NamespacedName, in); err != nil {
+		log.Info("Unable to find ClusterServiceVersion")
+		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
 	operatorCondition := &operatorsv2.OperatorCondition{
@@ -113,10 +112,9 @@ func (r *OperatorConditionGeneratorReconciler) Reconcile(ctx context.Context, re
 	}
 	ownerutil.AddOwner(operatorCondition, in, false, true)
 
-	err = r.ensureOperatorCondition(*operatorCondition)
-	if err != nil {
-		log.V(1).Error(err, "Error ensuring  ClusterServiceVersion")
-		return ctrl.Result{Requeue: true}, err
+	if err := r.ensureOperatorCondition(*operatorCondition); err != nil {
+		log.Info("Error ensuring  OperatorCondition")
+		return ctrl.Result{}, err
 	}
 
 	return ctrl.Result{}, nil