Skip to content

Commit 99b664f

Browse files
committed
chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@1ba8fc4
Reference-to: stackabletech/operator-templating@1ba8fc4 (Telemetry support for Helm)
1 parent 6bcd098 commit 99b664f

File tree

4 files changed

+82
-1
lines changed

4 files changed

+82
-1
lines changed

deny.toml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,27 @@ targets = [
99

1010
[advisories]
1111
yanked = "deny"
12+
ignore = [
13+
# https://rustsec.org/advisories/RUSTSEC-2023-0071
14+
# "rsa" crate: Marvin Attack: potential key recovery through timing sidechannel
15+
#
16+
# No patch is yet available, however work is underway to migrate to a fully constant-time implementation
17+
# So we need to accept this, as of SDP 24.11 we are not using the rsa crate to create certificates used in production
18+
# setups.
19+
#
20+
# TODO: Remove after https://github.com/RustCrypto/RSA/pull/394 is merged
21+
"RUSTSEC-2023-0071",
22+
23+
# https://rustsec.org/advisories/RUSTSEC-2024-0384
24+
# "instant" is unmaintained
25+
#
26+
# The upstream "kube" crate also silenced this in https://github.com/kube-rs/kube/commit/4f1e889f265da8f19f03f60683569cae1a154fda
27+
# They/we are actively working on migrating kube from backoff to backon, which removes the transitive dependency on
28+
# instant, in https://github.com/kube-rs/kube/pull/1652.
29+
#
30+
# TODO: Remove after https://github.com/kube-rs/kube/pull/1652 is merged
31+
"RUSTSEC-2024-0384",
32+
]
1233

1334
[bans]
1435
multiple-versions = "allow"
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
{{/*
2+
Create a list of telemetry related env vars.
3+
*/}}
4+
{{- define "telemetry.envVars" -}}
5+
{{- with .Values.telemetry }}
6+
{{- if not .consoleLog.enabled }}
7+
- name: CONSOLE_LOG_DISABLED
8+
value: "true"
9+
{{- end }}
10+
{{- if .consoleLog.level }}
11+
- name: CONSOLE_LOG_LEVEL
12+
value: {{ .consoleLog.level }}
13+
{{ end }}
14+
{{- if .consoleLog.format }}
15+
- name: CONSOLE_LOG_FORMAT
16+
value: {{ .consoleLog.format }}
17+
{{ end }}
18+
{{- if .fileLog.enabled }}
19+
- name: FILE_LOG_DIRECTORY
20+
value: /stackable/logs/{{ include "operator.appname" $ }}
21+
{{- end }}
22+
{{- if .fileLog.level }}
23+
- name: FILE_LOG_LEVEL
24+
value: {{ .fileLog.level }}
25+
{{- end }}
26+
{{- if .fileLog.rotationPeriod }}
27+
- name: FILE_LOG_ROTATION_PERIOD
28+
value: {{ .fileLog.rotationPeriod }}
29+
{{- end }}
30+
{{- if .fileLog.maxFiles }}
31+
- name: FILE_LOG_MAX_FILES
32+
value: {{ .fileLog.maxFiles }}
33+
{{- end }}
34+
{{- if .otelLogExporter.enabled }}
35+
- name: OTEL_LOG_EXPORTER_ENABLED
36+
value: "true"
37+
{{- end }}
38+
{{- if .otelLogExporter.level }}
39+
- name: OTEL_LOG_EXPORTER_LEVEL
40+
value: {{ .otelLogExporter.level }}
41+
{{- end }}
42+
{{- if .otelLogExporter.endpoint }}
43+
- name: OTEL_EXPORTER_OTLP_LOGS_ENDPOINT
44+
value: {{ .otelLogExporter.endpoint }}
45+
{{- end }}
46+
{{- if .otelTraceExporter.enabled }}
47+
- name: OTEL_TRACE_EXPORTER_ENABLED
48+
value: "true"
49+
{{- end }}
50+
{{- if .otelTraceExporter.level }}
51+
- name: OTEL_TRACE_EXPORTER_LEVEL
52+
value: {{ .otelTraceExporter.level }}
53+
{{- end }}
54+
{{- if .otelTraceExporter.endpoint }}
55+
- name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
56+
value: {{ .otelTraceExporter.endpoint }}
57+
{{- end }}
58+
{{- end }}
59+
{{- end }}

deploy/helm/nifi-operator/templates/deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ spec:
5151
- name: KUBERNETES_CLUSTER_DOMAIN
5252
value: {{ .Values.kubernetesClusterDomain | quote }}
5353
{{- end }}
54+
{{- include "telemetry.envVars" . | nindent 12 }}
5455
volumes:
5556
- name: config-spec
5657
configMap:

nix/README.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)