Merge pull request #198 from abays/fix_requeues

Log "not found" error instead of returning it if using RequeueAfter
openstack-k8s-operators · Aug 6, 2024 · 8a0f365 · 8a0f365
2 parents 9a5e2c9 + f85f9a3
commit 8a0f365
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/controllers/openstackbaremetalset_controller.go b/controllers/openstackbaremetalset_controller.go
@@ -250,12 +250,13 @@ func (r *OpenStackBaremetalSetReconciler) reconcileNormal(ctx context.Context, i
 	sshSecret, hash, err := oko_secret.GetSecret(ctx, helper, instance.Spec.DeploymentSSHSecret, instance.Namespace)
 	if err != nil {
 		if k8s_errors.IsNotFound(err) {
+			l.Info("Deployment SSH secret not found", "Deployment SSH secret", instance.Spec.DeploymentSSHSecret)
 			instance.Status.Conditions.Set(condition.FalseCondition(
 				condition.InputReadyCondition,
 				condition.RequestedReason,
 				condition.SeverityInfo,
 				condition.InputReadyWaitingMessage))
-			return ctrl.Result{RequeueAfter: time.Second * 10}, fmt.Errorf("Deployment SSH secret %s not found", instance.Spec.DeploymentSSHSecret)
+			return ctrl.Result{RequeueAfter: time.Second * 10}, nil
 		}
 		instance.Status.Conditions.Set(condition.FalseCondition(
 			condition.InputReadyCondition,
@@ -280,12 +281,13 @@ func (r *OpenStackBaremetalSetReconciler) reconcileNormal(ctx context.Context, i
 			instance.Spec.PasswordSecret.Namespace)
 		if err != nil {
 			if k8s_errors.IsNotFound(err) {
+				l.Info("Root password secret not found", "Root password secret", instance.Spec.PasswordSecret)
 				instance.Status.Conditions.Set(condition.FalseCondition(
 					condition.InputReadyCondition,
 					condition.RequestedReason,
 					condition.SeverityInfo,
 					condition.InputReadyWaitingMessage))
-				return ctrl.Result{RequeueAfter: time.Second * 10}, fmt.Errorf("Root password secret %s not found", instance.Spec.PasswordSecret)
+				return ctrl.Result{RequeueAfter: time.Second * 10}, nil
 			}
 			instance.Status.Conditions.Set(condition.FalseCondition(
 				condition.InputReadyCondition,
@@ -345,12 +347,13 @@ func (r *OpenStackBaremetalSetReconciler) reconcileNormal(ctx context.Context, i
 
 	if err != nil {
 		if k8s_errors.IsNotFound(err) {
+			l.Info("OpenStackProvisionServer not found", "OpenStackProvisionServer", instance.Spec.ProvisionServerName)
 			instance.Status.Conditions.Set(condition.FalseCondition(
 				baremetalv1.OpenStackBaremetalSetProvServerReadyCondition,
 				condition.RequestedReason,
 				condition.SeverityInfo,
 				baremetalv1.OpenStackBaremetalSetProvServerReadyWaitingMessage))
-			return ctrl.Result{RequeueAfter: time.Duration(10) * time.Second}, fmt.Errorf("OpenStackProvisionServer %s not found", instance.Spec.ProvisionServerName)
+			return ctrl.Result{RequeueAfter: time.Second * 10}, nil
 		}
 		instance.Status.Conditions.Set(condition.FalseCondition(
 			baremetalv1.OpenStackBaremetalSetProvServerReadyCondition,
@@ -368,7 +371,7 @@ func (r *OpenStackBaremetalSetReconciler) reconcileNormal(ctx context.Context, i
 			condition.SeverityInfo,
 			baremetalv1.OpenStackBaremetalSetProvServerReadyRunningMessage))
 		l.Info("OpenStackProvisionServer LocalImageURL not yet available", "OpenStackProvisionServer", provisionServer.Name)
-		return ctrl.Result{RequeueAfter: time.Duration(30) * time.Second}, nil
+		return ctrl.Result{RequeueAfter: time.Second * 30}, nil
 	}
 	instance.Status.Conditions.MarkTrue(baremetalv1.OpenStackBaremetalSetProvServerReadyCondition, baremetalv1.OpenStackBaremetalSetProvServerReadyMessage)
 	// handle provision server - end

diff --git a/controllers/openstackprovisionserver_controller.go b/controllers/openstackprovisionserver_controller.go
@@ -427,7 +427,7 @@ func (r *OpenStackProvisionServerReconciler) reconcileNormal(ctx context.Context
 			condition.SeverityInfo,
 			condition.DeploymentReadyRunningMessage))
 
-		return ctrl.Result{RequeueAfter: time.Duration(10) * time.Second}, nil
+		return ctrl.Result{RequeueAfter: time.Second * 10}, nil
 	}
 	// create Deployment - end
 
@@ -452,7 +452,7 @@ func (r *OpenStackProvisionServerReconciler) reconcileNormal(ctx context.Context
 			condition.SeverityInfo,
 			baremetalv1.OpenStackProvisionServerLocalImageURLReadyRunningMessage))
 
-		return ctrl.Result{RequeueAfter: time.Duration(10) * time.Second}, nil
+		return ctrl.Result{RequeueAfter: time.Second * 10}, nil
 	}
 	// check ProvisionIp/LocalImageURL - end