Merge pull request nexodus-io#1967 from chirino/main

grafana: update CRDs to new version structure.
chirino · Mar 7, 2024 · a64a20d · a64a20d
2 parents fb0fc8e + 3a633db
commit a64a20d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/deploy/nexodus-monitoring/base/grafana/apiserver-dashboard.yaml b/deploy/nexodus-monitoring/base/grafana/apiserver-dashboard.yaml
@@ -3,6 +3,10 @@ kind: GrafanaDashboard
 metadata:
   name: nexodus-dashboard
 spec:
+  resyncPeriod: 30s
+  instanceSelector:
+    matchLabels:
+      dashboards: "nexodus-grafana"
   json: >
     {
       "annotations": {

diff --git a/deploy/nexodus-monitoring/base/grafana/grafana.yaml b/deploy/nexodus-monitoring/base/grafana/grafana.yaml
@@ -2,14 +2,11 @@ apiVersion: grafana.integreatly.org/v1beta1
 kind: Grafana
 metadata:
   name: nexodus-grafana
+  labels:
+    dashboards: "nexodus-grafana"
 spec:
   client:
-    preferService: true
-  ingress:
-    enabled: true
-    hostname: grafana.127.0.0.1.nip.io
-    path: /
-    pathType: Prefix
+    preferIngress: false
   config:
     log:
       mode: "console"
@@ -20,12 +17,7 @@ spec:
     server:
       root_url: http://grafana.127.0.0.1.nip.io
     auth:
-      disable_login_form: false
-      disable_signout_menu: true
+      disable_login_form: "false"
+      disable_signout_menu: "true"
     auth.anonymous:
-      enabled: true
-  dashboardLabelSelector:
-    - matchExpressions:
-        - key: app.kubernetes.io/component
-          operator: In
-          values: [grafana]
+      enabled: "true"