Skip to content

Commit 0365040

Browse files
committed
don't display errors that are due to stale cache
1 parent 512ffb2 commit 0365040

File tree

1 file changed

+23
-5
lines changed

1 file changed

+23
-5
lines changed

pkg/controller/webhookrelayforward/webhookrelayforward_controller.go

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package webhookrelayforward
33
import (
44
"context"
55
"fmt"
6+
"strings"
67
"time"
78

89
appsv1 "k8s.io/api/apps/v1"
@@ -112,7 +113,7 @@ type ReconcileWebhookRelayForward struct {
112113
func (r *ReconcileWebhookRelayForward) Reconcile(request reconcile.Request) (reconcile.Result, error) {
113114
logger := log.WithValues("Request.Namespace", request.Namespace, "Request.Name", request.Name)
114115

115-
logger.Info("reconciling")
116+
// logger.Info("reconciling")
116117

117118
reconcilePeriod := reconcilePeriodSeconds * time.Second
118119
reconcileResult := reconcile.Result{RequeueAfter: reconcilePeriod}
@@ -159,7 +160,12 @@ func (r *ReconcileWebhookRelayForward) Reconcile(request reconcile.Request) (rec
159160
instance,
160161
)
161162
if updateErr != nil {
162-
logger.Error(updateErr, "Failed to update CR status")
163+
164+
if !strings.Contains(updateErr.Error(), "Operation cannot be fulfille") {
165+
logger.Error(updateErr, "Failed to update CR routing configuration status",
166+
"status", forwardv1.AgentStatusCreating,
167+
)
168+
}
163169
}
164170
if requeue {
165171
logger.Info("routing status updated, requeuing")
@@ -243,14 +249,22 @@ func (r *ReconcileWebhookRelayForward) reconcile(logger logr.Logger, instance *f
243249

244250
_, updateErr := r.updateDeploymentStatus(logger, forwardv1.AgentStatusCreating, false, instance)
245251
if updateErr != nil {
246-
logger.Error(updateErr, "Failed to update CR status")
252+
if !strings.Contains(updateErr.Error(), "Operation cannot be fulfille") {
253+
logger.Error(updateErr, "Failed to update CR status",
254+
"status", forwardv1.AgentStatusCreating,
255+
)
256+
}
247257
}
248258
return err
249259
}
250260

251261
_, updateErr := r.updateDeploymentStatus(logger, forwardv1.AgentStatusRunning, true, instance)
252262
if updateErr != nil {
253-
logger.Error(updateErr, "Failed to update CR status")
263+
if !strings.Contains(updateErr.Error(), "Operation cannot be fulfille") {
264+
logger.Error(updateErr, "Failed to update CR status",
265+
"status", forwardv1.AgentStatusRunning,
266+
)
267+
}
254268
}
255269

256270
// Deployment created successfully - don't requeue
@@ -265,7 +279,11 @@ func (r *ReconcileWebhookRelayForward) reconcile(logger logr.Logger, instance *f
265279
// TODO: check replicas 1/1 for Ready status
266280
_, updateErr := r.updateDeploymentStatus(logger, forwardv1.AgentStatusRunning, true, instance)
267281
if updateErr != nil {
268-
logger.Error(updateErr, "Failed to update CR status")
282+
if !strings.Contains(updateErr.Error(), "Operation cannot be fulfille") {
283+
logger.Error(updateErr, "Failed to update CR status",
284+
"status", forwardv1.AgentStatusRunning,
285+
)
286+
}
269287
}
270288

271289
// Deployment already exists - don't requeue

0 commit comments

Comments
 (0)