Fix http-add-on operator resources

Signed-off-by: Andrew Ballman <35912177+aballman@users.noreply.github.com>
kedacore · Nov 28, 2023 · 0a52413 · 0a52413
1 parent f70706b
commit 0a52413
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 1 deletion.
diff --git a/http-add-on/README.md b/http-add-on/README.md
@@ -92,6 +92,13 @@ their default values.
 | `images.operator` | string | `"ghcr.io/kedacore/http-add-on-operator"` | Image name for the operator image component |
 | `images.scaler` | string | `"ghcr.io/kedacore/http-add-on-scaler"` | Image name for the scaler image component |
 | `images.tag` | string | `""` | Image tag for the http add on. This tag is applied to the images listed in `images.operator`, `images.interceptor`, and `images.scaler`. Optional, given app version of Helm chart is used by default |
+| `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.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` |
 | `rbac.aggregateToDefaultRoles` | bool | `false` | Install aggregate roles for edit and view |
 
 ### Operator

diff --git a/http-add-on/templates/interceptor/deployment.yaml b/http-add-on/templates/interceptor/deployment.yaml
@@ -23,6 +23,9 @@ spec:
       serviceAccountName: {{ .Chart.Name }}-interceptor
       containers:
       - args:
+          - "--zap-log-level={{ .Values.logging.interceptor.level }}"
+          - "--zap-encoder={{ .Values.logging.interceptor.format }}"
+          - "--zap-time-encoding={{ .Values.logging.interceptor.timeEncoding }}"
         image: "{{ .Values.images.interceptor }}:{{ .Values.images.tag | default .Chart.AppVersion }}"
         imagePullPolicy: '{{ .Values.interceptor.pullPolicy | default "Always" }}'
         name: "{{ .Chart.Name }}-interceptor"

diff --git 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=10
+        - --v={{ .Values.logging.operator.level }}
         image: "{{ .Values.images.kubeRbacProxy.name }}:{{ .Values.images.kubeRbacProxy.tag }}"
         resources:
             limits:

diff --git a/http-add-on/templates/scaler/deployment.yaml b/http-add-on/templates/scaler/deployment.yaml
@@ -23,6 +23,9 @@ spec:
       serviceAccountName: {{ .Chart.Name }}-external-scaler
       containers:
       - args:
+          - "--zap-log-level={{ .Values.logging.scaler.level }}"
+          - "--zap-encoder={{ .Values.logging.scaler.format }}"
+          - "--zap-time-encoding={{ .Values.logging.scaler.timeEncoding }}"
         image: "{{ .Values.images.scaler }}:{{ .Values.images.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.scaler.pullPolicy | default "Always" }}
         name: "{{ .Chart.Name }}-external-scaler"

diff --git a/http-add-on/values.yaml b/http-add-on/values.yaml
@@ -5,6 +5,32 @@ crds:
   # -- Whether to install the `HTTPScaledObject` [`CustomResourceDefinition`](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/)
   install: true
 
+logging:
+  operator:
+    # -- Logging level for Metrics Server.
+    # allowed values: `0` for info, `4` for debug, or an integer value greater than 0
+    level: 0
+  scaler:
+    # -- Logging level for KEDA http-add-on Scaler.
+    # allowed values: `debug`, `info`, `error`, or an integer value greater than 0, specified as string
+    level: info
+    # -- Logging format for KEDA http-add-on Scaler.
+    # allowed values: `json` or `console`
+    format: console
+    # -- Logging time encoding for KEDA http-add-on Scaler.
+    # allowed values are `epoch`, `millis`, `nano`, `iso8601`, `rfc3339` or `rfc3339nano`
+    timeEncoding: rfc3339
+  interceptor:
+    # -- Logging level for KEDA http-add-on Interceptor.
+    # allowed values: `debug`, `info`, `error`, or an integer value greater than 0, specified as string
+    level: info
+    # -- Logging format for KEDA http-add-on Interceptor.
+    # allowed values: `json` or `console`
+    format: console
+    # -- Logging time encoding for KEDA http-add-on Interceptor.
+    # allowed values are `epoch`, `millis`, `nano`, `iso8601`, `rfc3339` or `rfc3339nano`
+    timeEncoding: rfc3339
+
 # operator-specific configuration values
 operator:
   # -- The image pull secrets for the operator component