Merge branch 'main' into feature/addingPodLabel

charts/lighthouse/templates/foghorn-deployment.yaml

@@ -55,6 +55,8 @@ spec:
             value: "{{ .Values.logFormat }}"
           - name: LOGRUS_SERVICE
             value: "{{ .Values.logService | default .Chart.Name }}"
+          - name: LOG_LEVEL
+            value: "{{ .Values.foghorn.logLevel }}"
           - name: LOGRUS_SERVICE_VERSION
             value: "{{ .Chart.Version }}"
           - name: LOGRUS_STACK_SKIP

charts/lighthouse/templates/gc-jobs-cj.yaml

@@ -8,13 +8,10 @@ spec:
   concurrencyPolicy: {{ .Values.gcJobs.concurrencyPolicy }}
   failedJobsHistoryLimit: {{ .Values.gcJobs.failedJobsHistoryLimit }}
   jobTemplate:
-    metadata:
-      creationTimestamp: null
     spec:
       backoffLimit: {{ .Values.gcJobs.backoffLimit }}
       template:
         metadata:
-          creationTimestamp: null
           labels:
             app: {{ template "gcJobs.name" . }}
             release: {{ .Release.Name }}
@@ -31,6 +28,9 @@ spec:
               args:
                 - "--namespace={{ .Release.Namespace }}"
                 - "--max-age={{ .Values.gcJobs.maxAge }}"
+              env:
+              - name: LOG_LEVEL
+                value: "{{ .Values.gcJobs.logLevel }}"
               name: {{ template "gcJobs.name" . }}
               resources: {}
               terminationMessagePath: /dev/termination-log

charts/lighthouse/templates/jenkins-controller-deployment.yaml

@@ -36,6 +36,8 @@ spec:
             value: "{{ .Values.logFormat }}"
           - name: LOGRUS_SERVICE
             value: "{{ .Values.logService | default .Chart.Name }}"
+          - name: LOG_LEVEL
+            value: "{{ .Values.jenkinscontroller.logLevel }}"
           - name: LOGRUS_SERVICE_VERSION
             value: "{{ .Chart.Version }}"
           - name: LOGRUS_STACK_SKIP

charts/lighthouse/templates/keeper-deployment.yaml

@@ -37,6 +37,9 @@ spec:
         imagePullPolicy: {{ tpl .Values.keeper.image.pullPolicy . }}
         args:
           - "--namespace={{ .Release.Namespace }}"
+        env:
+        - name: LOG_LEVEL
+          value: "{{ .Values.keeper.logLevel }}"
         ports:
           - name: http
             containerPort: {{ .Values.keeper.service.internalPort }}

charts/lighthouse/templates/poller-deployment.yaml

@@ -44,6 +44,9 @@ spec:
           {{- if .Values.poller.requireReleaseSuccess }}
           - --require-release-success
           {{- end }}
+        env:
+        - name: LOG_LEVEL
+          value: "{{ .Values.poller.logLevel }}"
         ports:
           - name: http
             containerPort: {{ .Values.poller.internalPort }}

charts/lighthouse/templates/tekton-controller-deployment.yaml

@@ -35,6 +35,8 @@ spec:
             value: "{{ .Values.logFormat }}"
           - name: LOGRUS_SERVICE
             value: "{{ .Values.logService | default .Chart.Name }}"
+          - name: LOG_LEVEL
+            value: "{{ .Values.tektoncontroller.logLevel }}"
           - name: LOGRUS_SERVICE_VERSION
             value: "{{ .Chart.Version }}"
           - name: LOGRUS_STACK_SKIP

charts/lighthouse/templates/webhooks-deployment.yaml

@@ -70,6 +70,8 @@ spec:
             value: "{{ .Values.logFormat }}"
           - name: LOGRUS_SERVICE
             value: "{{ .Values.logService | default .Chart.Name }}"
+          - name: LOG_LEVEL
+            value: "{{ .Values.webhooks.logLevel }}"
           - name: LOGRUS_SERVICE_VERSION
             value: "{{ .Chart.Version }}"
           - name: LOGRUS_STACK_SKIP

charts/lighthouse/values.yaml

@@ -34,9 +34,6 @@ logFormat: "json"
 # logService -- The name of the service registered with logging
 logService: ""
 
-# logLevel -- The logging level: debug, info, warn
-logLevel: "info"
-
 # logStackSkip -- Comma separated stack frames to skip from the log
 logStackSkip: ""
 
@@ -77,6 +74,9 @@ externalPlugins:
     name: lighthouse-webui-plugin
 
 gcJobs:
+  # logLevel -- The logging level: trace, debug, info, warn, error, fatal
+  logLevel: "info"
+
   # gcJobs.maxAge -- Max age from which `LighthouseJob`s will be deleted
   maxAge: 168h
 
@@ -106,6 +106,9 @@ gcJobs:
     pullPolicy: "{{ .Values.image.pullPolicy }}"
 
 webhooks:
+  # logLevel -- The logging level: trace, debug, info, warn, error, fatal
+  logLevel: "info"
+
   # webhooks.replicaCount -- Number of replicas
   replicaCount: 1
 
@@ -197,6 +200,9 @@ webhooks:
   customDeploymentTriggerCommand: ""
 
 foghorn:
+  # logLevel -- The logging level: trace, debug, info, warn, error, fatal
+  logLevel: "info"
+
   # foghorn.replicaCount -- Number of replicas
   replicaCount: 1
 
@@ -235,6 +241,9 @@ foghorn:
 
 
 tektoncontroller:
+  # logLevel -- The logging level: trace, debug, info, warn, error, fatal
+  logLevel: "info"
+
   # tektoncontroller.dashboardURL -- the dashboard URL (e.g. Tekton dashboard)
   dashboardURL: ''
   # tektoncontroller.dashboardTemplate -- Go template expression for URLs in the dashboard if not using Tekton dashboard
@@ -284,6 +293,9 @@ tektoncontroller:
     annotations: {}
 
 jenkinscontroller:
+  # logLevel -- The logging level: trace, debug, info, warn, error, fatal
+  logLevel: "info"
+
   # jenkinscontroller.jenkinsURL -- The URL of the Jenkins instance
   jenkinsURL:
 
@@ -334,6 +346,9 @@ jenkinscontroller:
     annotations: {}
 
 keeper:
+  # logLevel -- The logging level: trace, debug, info, warn, error, fatal
+  logLevel: "info"
+
   # keeper.statusContextLabel -- Label used to report status to git provider
   statusContextLabel: "Lighthouse Merge Status"
 
@@ -407,6 +422,9 @@ keeper:
   tolerations: []
 
 poller:
+  # logLevel -- The logging level: trace, debug, info, warn, error, fatal
+  logLevel: "info"
+
   # poller.enabled -- Whether to enable or disable the poller component
   enabled: false
 

pkg/config/lighthouse/config.go

@@ -53,7 +53,7 @@ type Config struct {
 	//
 	// Valid values:
 	//
-	// "debug", "info", "warn", "warning", "error", "fatal", "panic"
+	// "trace", "debug", "info", "warn", "warning", "error", "fatal", "panic"
 	//
 	// Defaults to "info".
 	LogLevel string `json:"log_level,omitempty"`