From 2acdf79601596600aeda5ca289d70d2c743fc1f8 Mon Sep 17 00:00:00 2001
From: Andrew Ballman <35912177+aballman@users.noreply.github.com>
Date: Tue, 28 Nov 2023 09:16:18 -0800
Subject: [PATCH] Address feedback items

Signed-off-by: Andrew Ballman <35912177+aballman@users.noreply.github.com>
---
 http-add-on/README.md                          |  5 ++++-
 http-add-on/templates/operator/deployment.yaml |  5 ++++-
 http-add-on/values.yaml                        | 17 ++++++++++++++---
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/http-add-on/README.md b/http-add-on/README.md
index d4a21efc..a69cbc06 100644
--- a/http-add-on/README.md
+++ b/http-add-on/README.md
@@ -95,7 +95,10 @@ their default values.
 | `logging.interceptor.format` | string | `"console"` | Logging format for KEDA http-add-on Interceptor. allowed values: `json` or `console` |
 | `logging.interceptor.level` | string | `"info"` | Logging level for KEDA http-add-on Interceptor. allowed values: `debug`, `info`, `error`, or an integer value greater than 0, specified as string |
 | `logging.interceptor.timeEncoding` | string | `"rfc3339"` | Logging time encoding for KEDA http-add-on Interceptor. allowed values are `epoch`, `millis`, `nano`, `iso8601`, `rfc3339` or `rfc3339nano` |
-| `logging.operator.level` | int | `0` | Logging level for Metrics Server. allowed values: `0` for info, `4` for debug, or an integer value greater than 0 |
+| `logging.operator.format` | string | `"console"` | Logging format for KEDA http-add-on operator. allowed values: `json` or `console` |
+| `logging.operator.level` | string | `"info"` | Logging level for KEDA http-add-on operator. allowed values: `debug`, `info`, `error`, or an integer value greater than 0, specified as string |
+| `logging.operator.rbacProxy.level` | int | `10` | Logging level for KEDA http-add-on operator rbac proxy allowed values: `0` for info, `4` for debug, or an integer value greater than 0 |
+| `logging.operator.timeEncoding` | string | `"rfc3339"` | Logging time encoding for KEDA http-add-on operator. allowed values are `epoch`, `millis`, `nano`, `iso8601`, `rfc3339` or `rfc3339nano` |
 | `logging.scaler.format` | string | `"console"` | Logging format for KEDA http-add-on Scaler. allowed values: `json` or `console` |
 | `logging.scaler.level` | string | `"info"` | Logging level for KEDA http-add-on Scaler. allowed values: `debug`, `info`, `error`, or an integer value greater than 0, specified as string |
 | `logging.scaler.timeEncoding` | string | `"rfc3339"` | Logging time encoding for KEDA http-add-on Scaler. allowed values are `epoch`, `millis`, `nano`, `iso8601`, `rfc3339` or `rfc3339nano` |
diff --git a/http-add-on/templates/operator/deployment.yaml b/http-add-on/templates/operator/deployment.yaml
index da33c4d6..a05bdca6 100644
--- a/http-add-on/templates/operator/deployment.yaml
+++ b/http-add-on/templates/operator/deployment.yaml
@@ -26,7 +26,7 @@ spec:
         - --secure-listen-address=0.0.0.0:{{ .Values.operator.port | default 8443 }}
         - --upstream=http://127.0.0.1:8080/
         - --logtostderr=true
-        - --v={{ .Values.logging.operator.level }}
+        - --v={{ .Values.logging.operator.rbacProxy.level }}
         image: "{{ .Values.images.kubeRbacProxy.name }}:{{ .Values.images.kubeRbacProxy.tag }}"
         resources:
             limits:
@@ -39,6 +39,9 @@ spec:
       - args:
         - --metrics-bind-address=127.0.0.1:8080
         - --leader-elect
+        - --zap-log-level={{ .Values.logging.operator.level }}
+        - --zap-time-encoding={{ .Values.logging.operator.timeEncoding }}
+        - --zap-encoder={{ .Values.logging.operator.format }}
         image: "{{ .Values.images.operator }}:{{ .Values.images.tag | default .Chart.AppVersion }}"
         imagePullPolicy: '{{ .Values.operator.pullPolicy | default "Always" }}'
         name: "{{ .Chart.Name }}-operator"
diff --git a/http-add-on/values.yaml b/http-add-on/values.yaml
index 296b9378..6c8090e1 100644
--- a/http-add-on/values.yaml
+++ b/http-add-on/values.yaml
@@ -7,9 +7,20 @@ crds:
 
 logging:
   operator:
-    # -- Logging level for Metrics Server.
-    # allowed values: `0` for info, `4` for debug, or an integer value greater than 0
-    level: 0
+    # -- Logging level for KEDA http-add-on operator.
+    # allowed values: `debug`, `info`, `error`, or an integer value greater than 0, specified as string
+    level: info
+    # -- Logging format for KEDA http-add-on operator.
+    # allowed values: `json` or `console`
+    format: console
+    # -- Logging time encoding for KEDA http-add-on operator.
+    # allowed values are `epoch`, `millis`, `nano`, `iso8601`, `rfc3339` or `rfc3339nano`
+    timeEncoding: rfc3339
+
+    rbacProxy:
+      # -- Logging level for KEDA http-add-on operator rbac proxy
+      # allowed values: `0` for info, `4` for debug, or an integer value greater than 0
+      level: 10
   scaler:
     # -- Logging level for KEDA http-add-on Scaler.
     # allowed values: `debug`, `info`, `error`, or an integer value greater than 0, specified as string