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.

Sign up for GitHub

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

Jump to bottom

feat(json_fmt): helm changes to enable json support #419

Merged
merged 1 commit into from
Mar 19, 2024
Merged

feat(json_fmt): helm changes to enable json support #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion chart/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ This removes all the Kubernetes components associated with the chart and deletes
| base.​default_req_timeout | Request timeout for rest & core agents | `"5s"` |
| base.​imagePullSecrets.​enabled | Enable imagePullSecrets for pulling our container images | `false` |
| base.​jaeger.​enabled | Enable jaeger tracing | `false` |
| base.​logSilenceLevel | Silence specific module components | `nil` |
| base.​logging.​color | Enable ansi color code for Pod StdOut/StdErr | `true` |
| base.​logging.​format | Valid values for format are pretty, json and compact | `"pretty"` |
| base.​logging.​silenceLevel | Silence specific module components | `nil` |
| base.​metrics.​enabled | Enable the metrics exporter | `true` |
| crds.​enabled | Install CRDs | `true` |
| crds.​jaeger.​enabled | Install Jaeger CRDs | `false` |
Expand Down
8 changes: 8 additions & 0 deletions chart/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,14 @@ Usage:
{{- include "coreListUniq" . | split "," | len -}}
{{- end -}}

{{- define "logFormat" -}}
{{- if (regexMatch "^((json|pretty|compact))$" .Values.base.logging.format) -}}
{{- print .Values.base.logging.format -}}
{{- else -}}
{{- fail "invalid logging format. valid values are json, pretty, compact" -}}
{{- end -}}
{{- end -}}

{{/* Get a list of cores as a comma-separated list */}}
{{- define "coreListUniq" -}}
{{- if .Values.io_engine.coreList -}}
Expand Down
12 changes: 8 additions & 4 deletions chart/templates/mayastor/agents/core/agent-core-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,16 @@ spec:
- "--events-url=nats://{{ .Release.Name }}-nats:4222"{{ end }}
{{- if not .Values.agents.ha.enabled }}
- "--disable-ha"{{ end }}
- "--fmt-style={{ include "logFormat" . }}"
abhilashshetty04 marked this conversation as resolved.
Show resolved Hide resolved
- "--ansi-colors={{ .Values.base.logging.color }}"
ports:
- containerPort: 50051
env:
- name: RUST_LOG
value: {{ .Values.agents.core.logLevel }}
{{- if default .Values.base.logSilenceLevel .Values.agents.core.logSilenceLevel }}
{{- if default .Values.base.logging.silenceLevel .Values.agents.core.logSilenceLevel }}
- name: RUST_LOG_SILENCE
value: {{ default .Values.base.logSilenceLevel .Values.agents.core.logSilenceLevel }}
value: {{ default .Values.base.logging.silenceLevel .Values.agents.core.logSilenceLevel }}
{{- end }}
- name: MY_POD_NAME
valueFrom:
Expand All @@ -92,14 +94,16 @@ spec:
- "--core-grpc=https://{{ .Release.Name }}-agent-core:50051"{{ if .Values.base.jaeger.enabled }}
- "--jaeger={{ .Values.base.jaeger.agent.name }}:{{ .Values.base.jaeger.agent.port }}"{{ end }}{{ if .Values.eventing.enabled }}
- "--events-url=nats://{{ .Release.Name }}-nats:4222"{{ end }}
- "--ansi-colors={{ .Values.base.logging.color }}"
- "--fmt-style={{ include "logFormat" . }}"
ports:
- containerPort: 50052
env:
- name: RUST_LOG
value: {{ .Values.agents.core.logLevel }}
{{- if default .Values.base.logSilenceLevel .Values.agents.core.logSilenceLevel }}
{{- if default .Values.base.logging.silenceLevel .Values.agents.core.logSilenceLevel }}
- name: RUST_LOG_SILENCE
value: {{ default .Values.base.logSilenceLevel .Values.agents.core.logSilenceLevel }}
value: {{ default .Values.logging.silenceLevel .Values.agents.core.logSilenceLevel }}
{{- end }}
- name: MY_POD_NAME
valueFrom:
Expand Down
6 changes: 4 additions & 2 deletions chart/templates/mayastor/agents/ha/ha-node-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ spec:
env:
- name: RUST_LOG
value: {{ .Values.agents.ha.node.logLevel }}
{{- if default .Values.base.logSilenceLevel .Values.agents.ha.node.logSilenceLevel }}
{{- if default .Values.base.logging.silenceLevel .Values.agents.ha.node.logSilenceLevel }}
- name: RUST_LOG_SILENCE
value: {{ default .Values.base.logSilenceLevel .Values.agents.ha.node.logSilenceLevel }}
value: {{ default .Values.base.logging.silenceLevel .Values.agents.ha.node.logSilenceLevel }}
{{- end }}
- name: MY_NODE_NAME
valueFrom:
Expand All @@ -76,6 +76,8 @@ spec:
- "--cluster-agent=https://{{ .Release.Name }}-agent-core:50052"{{ if .Values.base.jaeger.enabled }}
- "--jaeger={{ .Values.base.jaeger.agent.name }}:{{ .Values.base.jaeger.agent.port }}"{{ end }}{{ if .Values.eventing.enabled }}
- "--events-url=nats://{{ .Release.Name }}-nats:4222"{{ end }}
- "--ansi-colors={{ .Values.base.logging.color }}"
- "--fmt-style={{ include "logFormat" . }}"
volumeMounts:
- name: device
mountPath: /dev
Expand Down
6 changes: 4 additions & 2 deletions chart/templates/mayastor/apis/api-rest-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,15 @@ spec:
- "--request-timeout={{ .Values.base.default_req_timeout }}"{{ if .Values.base.jaeger.enabled }}
- "--jaeger={{ .Values.base.jaeger.agent.name }}:{{ .Values.base.jaeger.agent.port }}"{{ end }}
- "--core-grpc=https://{{ .Release.Name }}-agent-core:50051"
- "--ansi-colors={{ .Values.base.logging.color }}"
- "--fmt-style={{ include "logFormat" . }}"
ports:
- containerPort: 8080
- containerPort: 8081
env:
- name: RUST_LOG
value: {{ .Values.apis.rest.logLevel }}
{{- if default .Values.base.logSilenceLevel .Values.apis.rest.logSilenceLevel }}
{{- if default .Values.base.logging.silenceLevel .Values.apis.rest.logSilenceLevel }}
- name: RUST_LOG_SILENCE
value: {{ default .Values.base.logSilenceLevel .Values.apis.rest.logSilenceLevel }}
value: {{ default .Values.base.logging.silenceLevel .Values.apis.rest.logSilenceLevel }}
{{- end }}
6 changes: 4 additions & 2 deletions chart/templates/mayastor/csi/csi-controller-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,14 @@ spec:
{{- range $key, $val := .Values.csi.node.topology.segments }}
- "--node-selector={{ $key }}={{ $val }}"
{{- end }}
- "--ansi-colors={{ .Values.base.logging.color }}"
- "--fmt-style={{ include "logFormat" . }}"
env:
- name: RUST_LOG
value: {{ .Values.csi.controller.logLevel }}
{{- if default .Values.base.logSilenceLevel .Values.csi.controller.logSilenceLevel }}
{{- if default .Values.base.logging.silenceLevel .Values.csi.controller.logSilenceLevel }}
- name: RUST_LOG_SILENCE
value: {{ default .Values.base.logSilenceLevel .Values.csi.controller.logSilenceLevel }}
value: {{ default .Values.base.logging.silenceLevel .Values.csi.controller.logSilenceLevel }}
{{- end }}
volumeMounts:
- name: socket-dir
Expand Down
6 changes: 4 additions & 2 deletions chart/templates/mayastor/csi/csi-node-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ spec:
env:
- name: RUST_LOG
value: {{ .Values.csi.node.logLevel }}
{{- if default .Values.base.logSilenceLevel .Values.csi.node.logSilenceLevel }}
{{- if default .Values.base.logging.silenceLevel .Values.csi.node.logSilenceLevel }}
- name: RUST_LOG_SILENCE
value: {{ default .Values.base.logSilenceLevel .Values.csi.node.logSilenceLevel }}
value: {{ default .Values.base.logging.silenceLevel .Values.csi.node.logSilenceLevel }}
{{- end }}
- name: MY_NODE_NAME
valueFrom:
Expand Down Expand Up @@ -93,6 +93,8 @@ spec:
{{- range $key, $val := .Values.csi.node.topology.segments }}
- "--node-selector={{ $key }}={{ $val }}"
{{- end }}
- "--fmt-style={{ include "logFormat" . }}"
- "--ansi-colors={{ .Values.base.logging.color }}"
command:
- csi-node
volumeMounts:
Expand Down
3 changes: 3 additions & 0 deletions chart/templates/mayastor/io/io-engine-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ spec:
- containerPort: 9502
protocol: TCP
name: metrics
args:
- "--fmt-style={{ include "logFormat" . }}"
- "--ansi-colors={{ .Values.base.logging.color }}"
{{- end }}
- name: io-engine
image: "{{ .Values.image.registry }}/{{ .Values.image.repo }}/{{ .Chart.Name }}-io-engine:{{ default .Values.image.tag .Values.image.repoTags.dataPlane }}"
Expand Down
2 changes: 2 additions & 0 deletions chart/templates/mayastor/obs/obs-callhome-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ spec:
- "--namespace={{ .Release.Namespace }}"
- "--release-name={{ .Release.Name }}"
- "--mbus-url=nats://{{ .Release.Name }}-nats:4222"
- "--ansi-colors={{ .Values.base.logging.color }}"
- "--fmt-style={{ include "logFormat" . }}"
ports:
- containerPort: 9090
protocol: TCP
Expand Down
6 changes: 4 additions & 2 deletions chart/templates/mayastor/operators/operator-diskpool-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,14 @@ spec:
- "--request-timeout={{ .Values.base.default_req_timeout }}"
- "--interval={{ .Values.base.cache_poll_period }}"{{ if .Values.base.jaeger.enabled }}
- "--jaeger={{ .Values.base.jaeger.agent.name }}:{{ .Values.base.jaeger.agent.port }}"{{ end }}
- "--ansi-colors={{ .Values.base.logging.color }}"
- "--fmt-style={{ include "logFormat" . }}"
env:
- name: RUST_LOG
value: {{ .Values.operators.pool.logLevel }}
{{- if default .Values.base.logSilenceLevel .Values.operators.pool.logSilenceLevel }}
{{- if default .Values.base.logging.silenceLevel .Values.operators.pool.logSilenceLevel }}
- name: RUST_LOG_SILENCE
value: {{ default .Values.base.logSilenceLevel .Values.operators.pool.logSilenceLevel }}
value: {{ default .Values.base.logging.silenceLevel .Values.operators.pool.logSilenceLevel }}
{{- end }}
- name: MY_POD_NAME
valueFrom:
Expand Down
9 changes: 7 additions & 2 deletions chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,13 @@ base:
default_req_timeout: 5s
# -- Cache timeout for core agent & diskpool deployment
cache_poll_period: 30s
# -- Silence specific module components
logSilenceLevel:
logging:
# -- Valid values for format are pretty, json and compact
format: pretty
# -- Enable ansi color code for Pod StdOut/StdErr
color: true
# -- Silence specific module components
silenceLevel:
abhilashshetty04 marked this conversation as resolved.
Show resolved Hide resolved
initContainers:
enabled: true
containers:
Expand Down
Loading