Merge pull request #165 from appuio/fix/rbac-null-resource

Fix generating null resource

component/log_forwarder.libsonnet

@@ -161,7 +161,8 @@ local rbac = [
       namespace: params.namespace,
     } ],
   },
-  if lokiEnabled then kube._Object('rbac.authorization.k8s.io/v1', 'ClusterRoleBinding', 'logcollector-log-writer') {
+] + if lokiEnabled then [
+  kube._Object('rbac.authorization.k8s.io/v1', 'ClusterRoleBinding', 'logcollector-log-writer') {
     metadata+: {
       annotations+: {
         'argocd.argoproj.io/sync-wave': '-50',
@@ -179,7 +180,7 @@ local rbac = [
       namespace: params.namespace,
     } ],
   },
-];
+] else [];
 
 // Define outputs below
 if forwarderEnabled then

tests/golden/multilineerr/openshift4-logging/console-patching/openshift4_console_params.yaml

@@ -1,3 +0,0 @@
-config:
-  plugins:
-    - logging-view-plugin

tests/golden/multilineerr/openshift4-logging/openshift4-logging/20_subscriptions.yaml

@@ -20,42 +20,3 @@ spec:
   name: cluster-logging
   source: redhat-operators
   sourceNamespace: openshift-operators-redhat
----
-apiVersion: operators.coreos.com/v1alpha1
-kind: Subscription
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-wave: '-80'
-  labels:
-    name: loki-operator
-  name: loki-operator
-  namespace: openshift-operators-redhat
-spec:
-  channel: stable-6.1
-  config:
-    resources:
-      limits:
-        memory: 512Mi
-      requests:
-        cpu: 50m
-        memory: 381Mi
-  installPlanApproval: Automatic
-  name: loki-operator
-  source: openshift-operators-redhat
-  sourceNamespace: openshift-operators-redhat
----
-apiVersion: operators.coreos.com/v1alpha1
-kind: Subscription
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-wave: '-80'
-  labels:
-    name: cluster-observability-operator
-  name: cluster-observability-operator
-  namespace: openshift-operators-redhat
-spec:
-  channel: development
-  installPlanApproval: Automatic
-  name: cluster-observability-operator
-  source: openshift-operators-redhat
-  sourceNamespace: openshift-operators-redhat

tests/golden/multilineerr/openshift4-logging/openshift4-logging/40_log_forwarder.yaml

@@ -16,30 +16,21 @@ spec:
     tolerations:
       - key: storagenode
         operator: Exists
+  filters:
+    - name: detectexception
+      type: detectMultilineException
+    - name: labels
+      openshiftLabels:
+        foo: bar
+      type: openshiftLabels
+    - name: parse-json
+      type: parse
   managementState: Managed
-  outputs:
-    - lokiStack:
-        authentication:
-          token:
-            from: serviceAccount
-        target:
-          name: loki
-          namespace: openshift-logging
-      name: default-lokistack
-      tls:
-        ca:
-          configMapName: openshift-service-ca.crt
-          key: service-ca.crt
-      type: lokiStack
   pipelines:
-    - detectMultilineErrors: true
+    - filterRefs:
+        - detectexception
+        - labels
+        - parse-json
       name: application-logs
-      parse: json
-    - inputRefs:
-        - application
-        - infrastructure
-      name: default-lokistack
-      outputRefs:
-        - default-lokistack
   serviceAccount:
     name: logcollector

tests/golden/multilineerr/openshift4-logging/openshift4-logging/40_log_forwarder_rbac.yaml

@@ -61,21 +61,3 @@ subjects:
   - kind: ServiceAccount
     name: logcollector
     namespace: openshift-logging
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-wave: '-50'
-  labels:
-    name: logcollector-log-writer
-  name: logcollector-log-writer
-  namespace: openshift-logging
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: logging-collector-logs-writer
-subjects:
-  - kind: ServiceAccount
-    name: logcollector
-    namespace: openshift-logging