forked from grafana/loki
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
758750a
commit 1b035d3
Showing
2 changed files
with
6 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -140,7 +140,7 @@ type LokiStackReconciler struct { | |
// - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile | ||
func (r *LokiStackReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { | ||
|
||
r.Log.Info("Reconciliation for Request: ", "name", req.NamespacedName) | ||
r.Log.Info("Reconciliation for Request: ", "Name", req.Name, "Namespace", req.Namespace) | ||
|
||
ok, err := state.IsManaged(ctx, req, r.Client) | ||
if err != nil { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,12 +31,16 @@ type RulerConfigReconciler struct { | |
// - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile | ||
func (r *RulerConfigReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { | ||
|
||
r.Log.Info("Reconciliation for Request: ", "name", req.NamespacedName) | ||
r.Log.Info("Reconciliation for Request: ", "Name", req.Name, "Namespace", req.Namespace) | ||
|
||
var rc lokiv1.RulerConfig | ||
key := client.ObjectKey{Name: req.Name, Namespace: req.Namespace} | ||
if err := r.Get(ctx, key, &rc); err != nil { | ||
|
||
if errors.IsNotFound(err) { | ||
|
||
r.Log.Info("") | ||
|
||
// RulerConfig not found, remove annotation from LokiStack. | ||
err = lokistack.RemoveRulerConfigAnnotation(ctx, r.Client, req.Name, req.Namespace) | ||
if err != nil { | ||
|