Move deprecated collector config

appuio · Feb 28, 2024 · 3da50ae · 3da50ae
1 parent a79ee05
commit 3da50ae
Show file tree

Hide file tree

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

diff --git a/component/main.jsonnet b/component/main.jsonnet
@@ -22,6 +22,26 @@ local namespace_groups = (
     {}
 ) + params.clusterLogForwarding.namespace_groups;
 
+// --- Patch deprecated logging resource
+local legacyCollectionConfig = std.get(params.clusterLogging.collection, 'logs', {});
+local legacyCollectionPatch = if std.length(legacyCollectionConfig) > 0 then std.trace(
+  'Parameter `clusterLogging.collector.logs` is deprecated. Please update your config to use `clusterLogging.collector`',
+  {
+    local type = std.get(legacyCollectionConfig, 'type', ''),
+    local fluentd = std.get(legacyCollectionConfig, 'fluentd', {}),
+    collection+: {
+      [if type != '' then 'type']: type,
+    } + if std.length(fluentd) > 0 then fluentd,
+  }
+) else {};
+local clusterLogging = params.clusterLogging {
+  collection: {
+    [it]: params.clusterLogging.collection[it]
+    for it in std.objectFields(params.clusterLogging.collection)
+    if it != 'logs'
+  },
+} + legacyCollectionPatch;
+// --- End patch
 
 {
   '00_namespace': kube.Namespace(params.namespace) {
@@ -95,7 +115,7 @@ local namespace_groups = (
           'argocd.argoproj.io/sync-options': 'SkipDryRunOnMissingResource=true',
         },
       },
-      spec: params.clusterLogging,
+      spec: clusterLogging,
     }, {
       // Patch to remove certain keys, as the ClusterLogging operator would just
       // deploy elasticsearch or kibana if they are configured

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,7 @@ metadata:
   namespace: openshift-logging
 spec:
   collection:
-    logs:
-      fluentd: {}
-      type: 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,7 @@ metadata:
   namespace: openshift-logging
 spec:
   collection:
-    logs:
-      fluentd: {}
-      type: 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,7 @@ metadata:
   namespace: openshift-logging
 spec:
   collection:
-    logs:
-      fluentd: {}
-      type: 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,7 @@ metadata:
   namespace: openshift-logging
 spec:
   collection:
-    logs:
-      fluentd: {}
-      type: fluentd
+    type: fluentd
   logStore:
     elasticsearch:
       nodeCount: 3