Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix http-add-on verbosity configuration #568

Merged
merged 2 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions http-add-on/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,16 @@ 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.format` | string | `"console"` | Logging format for KEDA http-add-on operator. allowed values: `json` or `console` |
| `logging.operator.kubeRbacProxy.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.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.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` |
| `podSecurityContext` | object | [See below](#KEDA-is-secure-by-default) | [Pod security context] for all pods |
| `rbac.aggregateToDefaultRoles` | bool | `false` | Install aggregate roles for edit and view |
| `securityContext` | object | [See below](#KEDA-is-secure-by-default) | [Security context] for all containers |
Expand Down
3 changes: 3 additions & 0 deletions http-add-on/templates/interceptor/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ spec:
{{- end }}
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"
Expand Down
5 changes: 4 additions & 1 deletion http-add-on/templates/operator/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,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.kubeRbacProxy.level }}
image: "{{ .Values.images.kubeRbacProxy.name }}:{{ .Values.images.kubeRbacProxy.tag }}"
name: kube-rbac-proxy
resources:
Expand All @@ -53,6 +53,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"
Expand Down
3 changes: 3 additions & 0 deletions http-add-on/templates/scaler/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ spec:
{{- end }}
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"
Expand Down
37 changes: 37 additions & 0 deletions http-add-on/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,43 @@ 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 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

kubeRbacProxy:
# -- 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
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
Expand Down
Loading