diff --git a/pkg/controller/jenkins/jenkins_controller.go b/pkg/controller/jenkins/jenkins_controller.go index 1cff440b..05a085ab 100644 --- a/pkg/controller/jenkins/jenkins_controller.go +++ b/pkg/controller/jenkins/jenkins_controller.go @@ -110,13 +110,14 @@ func (r *ReconcileJenkins) Reconcile(request reconcile.Request) (reconcile.Resul result, err := r.reconcile(request, logger) if err != nil && apierrors.IsConflict(err) { - logger.V(log.VWarn).Info(err.Error()) return reconcile.Result{Requeue: true}, nil } else if err != nil { if log.Debug { logger.V(log.VWarn).Info(fmt.Sprintf("Reconcile loop failed: %+v", err)) } else { - logger.V(log.VWarn).Info(fmt.Sprintf("Reconcile loop failed: %s", err)) + if err.Error() != fmt.Sprintf("Operation cannot be fulfilled on jenkins.jenkins.io \"%s\": the object has been modified; please apply your changes to the latest version and try again", request.Name) { + logger.V(log.VWarn).Info(fmt.Sprintf("Reconcile loop failed: %s", err)) + } } return reconcile.Result{Requeue: true}, nil } diff --git a/pkg/controller/jenkins/jobs/jobs.go b/pkg/controller/jenkins/jobs/jobs.go index 4795680d..d1f68f6a 100644 --- a/pkg/controller/jenkins/jobs/jobs.go +++ b/pkg/controller/jenkins/jobs/jobs.go @@ -126,7 +126,7 @@ func (jobs *Jobs) ensureRunningBuild(build v1alpha1.Build, jenkins *v1alpha1.Jen err = jobs.updateBuildStatus(build, jenkins) if err != nil { - jobs.logger.V(log.VWarn).Info(fmt.Sprintf("Couldn't update build status, %+v", build)) + jobs.logger.V(log.VDebug).Info(fmt.Sprintf("Couldn't update build status, %+v", build)) return false, err } @@ -248,7 +248,7 @@ func (jobs *Jobs) buildJob(build v1alpha1.Build, parameters map[string]string, j err = jobs.updateBuildStatus(build, jenkins) if err != nil { - jobs.logger.V(log.VWarn).Info(fmt.Sprintf("Couldn't update build status, %+v", build)) + jobs.logger.V(log.VDebug).Info(fmt.Sprintf("Couldn't update build status, %+v", build)) return false, err } return false, nil