Clean up server-side apply issues

appuio · Dec 23, 2024 · 6530a39 · 6530a39
1 parent 8dc084e
commit 6530a39
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 8 deletions.
diff --git a/component/alertrules.libsonnet b/component/alertrules.libsonnet
@@ -64,7 +64,11 @@ local dropInfoRules =
   };
 
 local prometheus_rules(name, groups, baseURL) = kube._Object('monitoring.coreos.com/v1', 'PrometheusRule', name) {
-  metadata+: {
+  metadata: {
+    labels: {
+      name: name,
+    },
+    name: name,
     namespace: params.namespace,
   },
   spec: {

diff --git a/tests/golden/defaults/openshift4-logging/openshift4-logging/60_collector_alerts.yaml b/tests/golden/defaults/openshift4-logging/openshift4-logging/60_collector_alerts.yaml
@@ -1,7 +1,6 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  annotations: {}
   labels:
     name: syn-collector-rules
   name: syn-collector-rules

diff --git a/tests/golden/defaults/openshift4-logging/openshift4-logging/60_lokistack_alerts.yaml b/tests/golden/defaults/openshift4-logging/openshift4-logging/60_lokistack_alerts.yaml
@@ -1,7 +1,6 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  annotations: {}
   labels:
     name: syn-loki-logging-rules
   name: syn-loki-logging-rules

diff --git a/tests/golden/forwardingonly/openshift4-logging/openshift4-logging/60_collector_alerts.yaml b/tests/golden/forwardingonly/openshift4-logging/openshift4-logging/60_collector_alerts.yaml
@@ -1,7 +1,6 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  annotations: {}
   labels:
     name: syn-collector-rules
   name: syn-collector-rules

diff --git a/tests/golden/master/openshift4-logging/openshift4-logging/60_collector_alerts.yaml b/tests/golden/master/openshift4-logging/openshift4-logging/60_collector_alerts.yaml
@@ -1,7 +1,6 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  annotations: {}
   labels:
     name: syn-collector-rules
   name: syn-collector-rules

diff --git a/tests/golden/master/openshift4-logging/openshift4-logging/60_lokistack_alerts.yaml b/tests/golden/master/openshift4-logging/openshift4-logging/60_lokistack_alerts.yaml
@@ -1,7 +1,6 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  annotations: {}
   labels:
     name: syn-loki-logging-rules
   name: syn-loki-logging-rules

diff --git a/tests/golden/multilineerr/openshift4-logging/openshift4-logging/60_collector_alerts.yaml b/tests/golden/multilineerr/openshift4-logging/openshift4-logging/60_collector_alerts.yaml
@@ -1,7 +1,6 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  annotations: {}
   labels:
     name: syn-collector-rules
   name: syn-collector-rules

diff --git a/tests/golden/multilineerr/openshift4-logging/openshift4-logging/60_lokistack_alerts.yaml b/tests/golden/multilineerr/openshift4-logging/openshift4-logging/60_lokistack_alerts.yaml
@@ -1,7 +1,6 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
-  annotations: {}
   labels:
     name: syn-loki-logging-rules
   name: syn-loki-logging-rules

diff --git a/tests/master.yml b/tests/master.yml
@@ -26,6 +26,10 @@ parameters:
     channel: 'stable'
 
     clusterLogForwarder:
+      filters:
+        my-filter:
+          openshiftLabels:
+            cluster_id: ${cluster:name}
       inputs:
         my-apps:
           application: