Skip to content

Commit 090236a

Browse files
committed
Add options to configure zap logging through Helm values
Signed-off-by: Shiva Krishna, Merla <smerla@nvidia.com>
1 parent 7171c70 commit 090236a

File tree

4 files changed

+37
-2
lines changed

4 files changed

+37
-2
lines changed

cmd/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func main() {
8787
flag.BoolVar(&enableHTTP2, "enable-http2", false,
8888
"If set, HTTP/2 will be enabled for the metrics and webhook servers")
8989
opts := zap.Options{
90-
Development: true,
90+
Development: false,
9191
}
9292
opts.BindFlags(flag.CommandLine)
9393
flag.Parse()

deployments/helm/k8s-nim-operator/templates/_helpers.tpl

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,28 @@ Full image name with tag
5656
{{- define "k8s-nim-operator.fullimage" -}}
5757
{{- .Values.operator.image.repository -}}:{{- .Values.operator.image.tag | default (printf "v%s" .Chart.AppVersion) -}}
5858
{{- end }}
59+
60+
{{/*
61+
Return merged operator args with zap logging args
62+
*/}}
63+
{{- define "k8s-nim-operator.fullArgs" -}}
64+
{{- $op := .Values.operator | default dict -}}
65+
{{- $log := $op.log | default dict -}}
66+
67+
{{- $zapDevel := $log.development | default false -}}
68+
{{- $zapLevel := $log.level | default "info" -}}
69+
{{- $zapStack := $log.stacktraceLevel | default "error" -}}
70+
{{- $zapEncoder := $log.encoder | default "json" -}}
71+
72+
{{- $args := list -}}
73+
{{- range ($op.args | default (list)) }}
74+
{{- $args = append $args . -}}
75+
{{- end -}}
76+
77+
{{- $args = append $args (printf "--zap-devel=%v" $zapDevel) -}}
78+
{{- $args = append $args (printf "--zap-log-level=%s" $zapLevel) -}}
79+
{{- $args = append $args (printf "--zap-stacktrace-level=%s" $zapStack) -}}
80+
{{- $args = append $args (printf "--zap-encoder=%s" $zapEncoder) -}}
81+
82+
{{- toYaml $args -}}
83+
{{- end }}

deployments/helm/k8s-nim-operator/templates/deployment.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ spec:
2828
{{- end }}
2929
spec:
3030
containers:
31-
- args: {{- toYaml .Values.operator.args | nindent 8 }}
31+
- args:
32+
{{- include "k8s-nim-operator.fullArgs" . | nindent 8 }}
3233
command:
3334
- /manager
3435
image: {{ include "k8s-nim-operator.fullimage" . }}

deployments/helm/k8s-nim-operator/values.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@ operator:
1010
- --health-probe-bind-address=:8081
1111
- --metrics-bind-address=:8080
1212
- --leader-elect
13+
log:
14+
# Enable development mode
15+
development: false
16+
# Log verbosity level (debug | info | warn | error | dpanic | panic | fatal)
17+
level: info
18+
# Stacktrace generation level (debug | info | warn | error | dpanic | panic | fatal)
19+
stacktraceLevel: error
20+
# Log encoder format (json|console)
21+
encoder: json
1322
resources:
1423
limits:
1524
cpu: "1"

0 commit comments

Comments
 (0)