Migrate console-plugin to observability operator

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

Hide file tree

Showing 10 changed files with 133 additions and 13 deletions.
diff --git a/component/log_forwarder.libsonnet b/component/log_forwarder.libsonnet
@@ -109,13 +109,13 @@ local rbac = [
     roleRef: {
       apiGroup: 'rbac.authorization.k8s.io',
       kind: 'ClusterRole',
-      name: 'collect-application-logs'
+      name: 'collect-application-logs',
     },
-    subjects: [{
+    subjects: [ {
       kind: 'ServiceAccount',
       name: 'logcollector',
-      namespace: params.namespace
-    }],
+      namespace: params.namespace,
+    } ],
   },
   kube._Object('rbac.authorization.k8s.io/v1', 'ClusterRoleBinding', 'logcollector-infrastructure-logs') {
     metadata+: {
@@ -127,13 +127,13 @@ local rbac = [
     roleRef: {
       apiGroup: 'rbac.authorization.k8s.io',
       kind: 'ClusterRole',
-      name: 'collect-infrastructure-logs'
+      name: 'collect-infrastructure-logs',
     },
-    subjects: [{
+    subjects: [ {
       kind: 'ServiceAccount',
       name: 'logcollector',
-      namespace: params.namespace
-    }],
+      namespace: params.namespace,
+    } ],
   },
   kube._Object('rbac.authorization.k8s.io/v1', 'ClusterRoleBinding', 'logcollector-audit-logs') {
     metadata+: {
@@ -145,13 +145,13 @@ local rbac = [
     roleRef: {
       apiGroup: 'rbac.authorization.k8s.io',
       kind: 'ClusterRole',
-      name: 'collect-audit-logs'
+      name: 'collect-audit-logs',
     },
-    subjects: [{
+    subjects: [ {
       kind: 'ServiceAccount',
       name: 'logcollector',
-      namespace: params.namespace
-    }],
+      namespace: params.namespace,
+    } ],
   },
 ];
 

diff --git a/component/log_lokistack.libsonnet b/component/log_lokistack.libsonnet
@@ -117,13 +117,34 @@ local aggregate_loki_log_access = kube.ClusterRole('syn:loki:cluster-reader') {
   ],
 };
 
+// Console Log Plugin
+local console_plugin = kube._Object('observability.openshift.io/v1alpha1', 'UIPlugin', 'logging') {
+  metadata: {
+    labels: {
+      name: 'logging',
+    },
+    name: 'logging',
+  },
+  spec: {
+    type: 'Logging',
+    logging: {
+      lokiStack: {
+        name: 'loki',
+      },
+      logsLimit: 50,
+      timeout: '30s',
+    },
+  },
+};
+
 // Define outputs below
 if loki.enabled then
   {
     '30_loki_stack': lokistack,
     '30_loki_logstore': logstore,
     '30_loki_netpol': [ netpol_viewplugin, netpol_lokigateway ],
     '30_loki_rbac': [ aggregate_loki_log_access ],
+    '30_loki_plugin': console_plugin,
   }
 else
   std.trace(

diff --git a/component/main.jsonnet b/component/main.jsonnet
@@ -69,9 +69,22 @@ local lokistack = if lokiEnabled then operatorlib.managedSubscription(
   },
 };
 
+local observability = if lokiEnabled then operatorlib.managedSubscription(
+  'openshift-operators-redhat',
+  'cluster-observability-operator',
+  'development'
+) {
+  metadata+: {
+    annotations+: {
+      'argocd.argoproj.io/sync-wave': '-80',
+    },
+  },
+};
+
 local subscriptions = std.filter(function(it) it != null, [
   logging,
   lokistack,
+  observability,
 ]);
 
 local secrets = com.generateResources(params.secrets, kube.Secret);

diff --git a/tests/defaults.yml b/tests/defaults.yml
@@ -16,7 +16,6 @@ parameters:
         input_paths:
           - tests/console-patch.jsonnet
         output_path: console-patching/
-
   openshift4_operators:
     defaultInstallPlanApproval: Automatic
     defaultSource: openshift-operators-redhat

diff --git a/tests/golden/defaults/openshift4-logging/openshift4-logging/20_subscriptions.yaml b/tests/golden/defaults/openshift4-logging/openshift4-logging/20_subscriptions.yaml
@@ -43,3 +43,19 @@ spec:
   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
diff --git a/tests/golden/defaults/openshift4-logging/openshift4-logging/30_loki_plugin.yaml b/tests/golden/defaults/openshift4-logging/openshift4-logging/30_loki_plugin.yaml
@@ -0,0 +1,13 @@
+apiVersion: observability.openshift.io/v1alpha1
+kind: UIPlugin
+metadata:
+  labels:
+    name: logging
+  name: logging
+spec:
+  logging:
+    logsLimit: 50
+    lokiStack:
+      name: loki
+    timeout: 30s
+  type: Logging
diff --git a/tests/golden/master/openshift4-logging/openshift4-logging/20_subscriptions.yaml b/tests/golden/master/openshift4-logging/openshift4-logging/20_subscriptions.yaml
@@ -43,3 +43,19 @@ spec:
   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
diff --git a/tests/golden/master/openshift4-logging/openshift4-logging/30_loki_plugin.yaml b/tests/golden/master/openshift4-logging/openshift4-logging/30_loki_plugin.yaml
@@ -0,0 +1,13 @@
+apiVersion: observability.openshift.io/v1alpha1
+kind: UIPlugin
+metadata:
+  labels:
+    name: logging
+  name: logging
+spec:
+  logging:
+    logsLimit: 50
+    lokiStack:
+      name: loki
+    timeout: 30s
+  type: Logging
diff --git a/tests/golden/multilineerr/openshift4-logging/openshift4-logging/20_subscriptions.yaml b/tests/golden/multilineerr/openshift4-logging/openshift4-logging/20_subscriptions.yaml
@@ -43,3 +43,19 @@ spec:
   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
diff --git a/tests/golden/multilineerr/openshift4-logging/openshift4-logging/30_loki_plugin.yaml b/tests/golden/multilineerr/openshift4-logging/openshift4-logging/30_loki_plugin.yaml
@@ -0,0 +1,13 @@
+apiVersion: observability.openshift.io/v1alpha1
+kind: UIPlugin
+metadata:
+  labels:
+    name: logging
+  name: logging
+spec:
+  logging:
+    logsLimit: 50
+    lokiStack:
+      name: loki
+    timeout: 30s
+  type: Logging