From 0536fb2053210f0e8a68633d1cff0bea7876dc11 Mon Sep 17 00:00:00 2001
From: "Han Verstraete (OpenFaaS Ltd)" <han@openfaas.com>
Date: Wed, 3 Jan 2024 13:30:00 +0100
Subject: [PATCH] Support structured logging config for faas-netes
 (Pro/Enterprise)

Support configuration for debug level logging and JSON logging for the
faas-netes controller (Pro/Enterprise).

Signed-off-by: Han Verstraete (OpenFaaS Ltd) <han@openfaas.com>
---
 chart/openfaas/README.md                  | 2 ++
 chart/openfaas/templates/gateway-dep.yaml | 6 ++++++
 chart/openfaas/values.yaml                | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/chart/openfaas/README.md b/chart/openfaas/README.md
index ddc44f4ece..78ce362e08 100644
--- a/chart/openfaas/README.md
+++ b/chart/openfaas/README.md
@@ -490,6 +490,8 @@ yaml) |
 | `faasnetes.resources` | Resource limits and requests for faas-netes container | See [values.yaml](./values.yaml) |
 | `faasnetes.writeTimeout` | Write timeout for the faas-netes API | `""` (defaults to gateway.writeTimeout) |
 | `faasnetesPro.image` | Container image used for faas-netes when `openfaasPro=true` | See [values.yaml](./values.yaml) |
+| `faasnetesPro.logs.format` | Set the log format, supports `console` or `json` | `console` |
+| `faasnetesPro.logs.debug` | Print debug logs | `false` |
 | `operator.create` | Use the OpenFaaS operator CRD controller, default uses faas-netes as the Kubernetes controller | `false` |
 | `operator.image` | Container image used for the openfaas-operator | See [values.yaml](./values.yaml) |
 | `operator.resources` | Resource limits and requests for openfaas-operator containers | See [values.yaml](./values.yaml) |
diff --git a/chart/openfaas/templates/gateway-dep.yaml b/chart/openfaas/templates/gateway-dep.yaml
index 18f17a72a1..1a07ee455c 100644
--- a/chart/openfaas/templates/gateway-dep.yaml
+++ b/chart/openfaas/templates/gateway-dep.yaml
@@ -434,6 +434,12 @@ spec:
         - name: auditing_http_verbs
           value: "{{ .Values.eventSubscription.auditing.httpVerbs }}"
         {{- end}}
+        {{- if .Values.faasnetesPro.logs}}
+        - name: "debug"
+          value: "{{ .Values.faasnetesPro.logs.debug }}"
+        - name: "log_encoding"
+          value: "{{ .Values.faasnetesPro.logs.format }}"
+        {{- end }}
         volumeMounts:
         {{- if .Values.iam.enabled }}
         - name: issuer-key
diff --git a/chart/openfaas/values.yaml b/chart/openfaas/values.yaml
index d57a6464cf..05344e7110 100644
--- a/chart/openfaas/values.yaml
+++ b/chart/openfaas/values.yaml
@@ -172,6 +172,9 @@ operator:
 
 faasnetesPro:
   image: ghcr.io/openfaasltd/faas-netes:0.5.14
+  logs:
+    debug: false
+    format: "console"
 
 # For the Community Edition
 faasnetes: