Skip to content

Commit 89ae88c

Browse files
committed
fix: Ignore not-found errors
1 parent 99ca068 commit 89ae88c

5 files changed

+19
-5
lines changed

controllers/gitprojector_controller.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,10 @@ func (r *GitProjectorReconciler) Reconcile(ctx context.Context, req ctrl.Request
7272
var obj templatesv1alpha1.GitProjector
7373
err = r.Get(ctx, req.NamespacedName, &obj)
7474
if err != nil {
75-
logger.Error(err, "Get failed")
7675
err = client.IgnoreNotFound(err)
76+
if err != nil {
77+
logger.Error(err, "Get failed")
78+
}
7779
return
7880
}
7981

controllers/listgithubpullrequests_controller.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,15 @@ type ListGithubPullRequestsReconciler struct {
4949
//+kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch
5050

5151
func (r *ListGithubPullRequestsReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
52-
_ = log.FromContext(ctx)
52+
logger := log.FromContext(ctx)
5353

5454
var obj templatesv1alpha1.ListGithubPullRequests
5555
err := r.Get(ctx, req.NamespacedName, &obj)
5656
if err != nil {
57+
err = client.IgnoreNotFound(err)
58+
if err != nil {
59+
logger.Error(err, "Get failed")
60+
}
5761
return ctrl.Result{}, err
5862
}
5963

controllers/listgitlabmergerequests_controller.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,15 @@ type ListGitlabMergeRequestsReconciler struct {
4646
//+kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch
4747

4848
func (r *ListGitlabMergeRequestsReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
49-
_ = log.FromContext(ctx)
49+
logger := log.FromContext(ctx)
5050

5151
var obj templatesv1alpha1.ListGitlabMergeRequests
5252
err := r.Get(ctx, req.NamespacedName, &obj)
5353
if err != nil {
54+
err = client.IgnoreNotFound(err)
55+
if err != nil {
56+
logger.Error(err, "Get failed")
57+
}
5458
return ctrl.Result{}, err
5559
}
5660

controllers/objecttemplate_controller.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,10 @@ func (r *ObjectTemplateReconciler) Reconcile(ctx context.Context, req ctrl.Reque
6969
var rt templatesv1alpha1.ObjectTemplate
7070
err = r.Get(ctx, req.NamespacedName, &rt)
7171
if err != nil {
72-
logger.Error(err, "Get failed")
7372
err = client.IgnoreNotFound(err)
73+
if err != nil {
74+
logger.Error(err, "Get failed")
75+
}
7476
return
7577
}
7678

controllers/texttemplate_controller.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ func (r *TextTemplateReconciler) Reconcile(ctx context.Context, req ctrl.Request
5959
var tt templatesv1alpha1.TextTemplate
6060
err = r.Get(ctx, req.NamespacedName, &tt)
6161
if err != nil {
62-
logger.Error(err, "Get failed")
6362
err = client.IgnoreNotFound(err)
63+
if err != nil {
64+
logger.Error(err, "Get failed")
65+
}
6466
return
6567
}
6668

0 commit comments

Comments
 (0)