Move deprecated collector config

appuio · Feb 28, 2024 · 7b6c655 · 7b6c655
1 parent a79ee05
commit 7b6c655
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -86,9 +86,8 @@ parameters:
           nodeSelector:
             node-role.kubernetes.io/infra: ''
       collection:
-        logs:
-          type: fluentd
-          fluentd: {}
+        type: fluentd
+        fluentd: {}
 
     clusterLogForwarding:
       enabled: false

diff --git a/tests/golden/defaults/openshift4-logging/openshift4-logging/30_cluster_logging.yaml b/tests/golden/defaults/openshift4-logging/openshift4-logging/30_cluster_logging.yaml
@@ -9,9 +9,8 @@ metadata:
   namespace: openshift-logging
 spec:
   collection:
-    logs:
-      fluentd: {}
-      type: fluentd
+    fluentd: {}
+    type: fluentd
   logStore:
     elasticsearch:
       nodeCount: 3

diff --git a/tests/golden/lokistack/openshift4-logging/openshift4-logging/30_cluster_logging.yaml b/tests/golden/lokistack/openshift4-logging/openshift4-logging/30_cluster_logging.yaml
@@ -9,9 +9,8 @@ metadata:
   namespace: openshift-logging
 spec:
   collection:
-    logs:
-      fluentd: {}
-      type: fluentd
+    fluentd: {}
+    type: fluentd
   logStore:
     lokistack:
       name: loki

diff --git a/tests/golden/master/openshift4-logging/openshift4-logging/30_cluster_logging.yaml b/tests/golden/master/openshift4-logging/openshift4-logging/30_cluster_logging.yaml
@@ -9,9 +9,8 @@ metadata:
   namespace: openshift-logging
 spec:
   collection:
-    logs:
-      fluentd: {}
-      type: fluentd
+    fluentd: {}
+    type: fluentd
   logStore:
     elasticsearch:
       nodeCount: 3

diff --git a/tests/golden/multilineerr/openshift4-logging/openshift4-logging/30_cluster_logging.yaml b/tests/golden/multilineerr/openshift4-logging/openshift4-logging/30_cluster_logging.yaml
@@ -9,9 +9,8 @@ metadata:
   namespace: openshift-logging
 spec:
   collection:
-    logs:
-      fluentd: {}
-      type: fluentd
+    fluentd: {}
+    type: fluentd
   logStore:
     elasticsearch:
       nodeCount: 3