Merge branch 'main' of https://github.com/mariodietner/loki

mariodietner · Jan 18, 2024 · 9037de0 · 9037de0
2 parents c6ad3f0 + 0a9b487
commit 9037de0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/operator/controllers/loki/internal/lokistack/ruler_config_discovery.go b/operator/controllers/loki/internal/lokistack/ruler_config_discovery.go
@@ -64,8 +64,8 @@ func RemoveRulerConfigAnnotation(ctx context.Context, k k8s.Client, name, namesp
 	return nil
 }
 
-func getLokiStack(ctx context.Context, k k8s.Client, key client.ObjectKey) (*lokiv1.RulerConfig, error) {
-	var s lokiv1.RulerConfig
+func getLokiStack(ctx context.Context, k k8s.Client, key client.ObjectKey) (*lokiv1.LokiStack, error) {
+	var s lokiv1.LokiStack
 
 	if err := k.Get(ctx, key, &s); err != nil {
 

diff --git a/operator/hack/rulerconfig.yaml b/operator/hack/rulerconfig.yaml
@@ -1,7 +1,7 @@
 apiVersion: loki.grafana.com/v1
 kind: RulerConfig
 metadata:
-  name: rulerconfig-dev
+  name: lokistack-dev
 spec:
   alertmanager:
     endpoints: