Use the TektonConfig to customize the logging

We have been using kustomize to create ConfigMap (config-logging) to customize the pipelines' pods logs to adhere with ADR-6. That configuration is now overriden by the Tekton operator. We use the TektonConfig now to customize the logs. Added configuration for triggers log.
openshift-pipelines · Mar 18, 2024 · 762cef0 · 762cef0
1 parent bb03c53
commit 762cef0
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 43 deletions.
diff --git a/operator/gitops/argocd/pipeline-service/openshift-pipelines/config-logging.yaml b/operator/gitops/argocd/pipeline-service/openshift-pipelines/config-logging.yaml
diff --git a/operator/gitops/argocd/pipeline-service/openshift-pipelines/kustomization.yaml b/operator/gitops/argocd/pipeline-service/openshift-pipelines/kustomization.yaml
@@ -7,7 +7,6 @@ resources:
   - appstudio-pipelines-scc.yaml
   - openshift-operator.yaml
   - tekton-config.yaml
-  - config-logging.yaml
   - chains-service-monitor.yaml
   - bugfix-pac-gitauth-secrets.yaml
   # Manually add ConfigMap and Service until PLNSRVCE-1359 is fixed

diff --git a/operator/gitops/argocd/pipeline-service/openshift-pipelines/tekton-config.yaml b/operator/gitops/argocd/pipeline-service/openshift-pipelines/tekton-config.yaml
@@ -43,6 +43,39 @@ spec:
 
     # Rekor integration is disabled for now. It is planned to be re-introduced in the future.
     transparency.enabled: "false"
+  trigger:
+    options:
+      configMaps:
+        config-logging-triggers:
+          data:
+            loglevel.controller: info
+            loglevel.webhook: info
+            loglevel.eventlistener: info
+            zap-logger-config: |
+              {
+                "level": "info",
+                "development": false,
+                "sampling": {
+                  "initial": 100,
+                  "thereafter": 100
+                },
+                "outputPaths": ["stdout"],
+                "errorOutputPaths": ["stderr"],
+                "encoding": "json",
+                "encoderConfig": {
+                  "timeKey": "ts",
+                  "levelKey": "level",
+                  "nameKey": "logger",
+                  "callerKey": "caller",
+                  "messageKey": "msg",
+                  "stacktraceKey": "stacktrace",
+                  "lineEnding": "",
+                  "levelEncoder": "",
+                  "timeEncoder": "iso8601",
+                  "durationEncoder": "string",
+                  "callerEncoder": ""
+                }
+              }
   pipeline:
     default-service-account: appstudio-pipeline
     enable-api-fields: alpha
@@ -53,6 +86,36 @@ spec:
     enable-tekton-oci-bundles: true
     options:
       disabled: false
+      configMaps:
+        config-logging:
+          data:
+            loglevel.controller: info
+            loglevel.webhook: info
+            zap-logger-config: |
+              {
+                "level": "info",
+                "development": false,
+                "sampling": {
+                  "initial": 100,
+                  "thereafter": 100
+                },
+                "outputPaths": ["stdout"],
+                "errorOutputPaths": ["stderr"],
+                "encoding": "json",
+                "encoderConfig": {
+                  "timeKey": "ts",
+                  "levelKey": "level",
+                  "nameKey": "logger",
+                  "callerKey": "caller",
+                  "messageKey": "msg",
+                  "stacktraceKey": "stacktrace",
+                  "lineEnding": "",
+                  "levelEncoder": "",
+                  "timeEncoder": "iso8601",
+                  "durationEncoder": "string",
+                  "callerEncoder": ""
+                }
+              }
       deployments:
         tekton-operator-proxy-webhook:
           spec: