From 323f6b5d1353f57762b6ec59936460ae04fb4a86 Mon Sep 17 00:00:00 2001 From: Stacky McStackface Date: Tue, 15 Apr 2025 09:45:07 +0000 Subject: [PATCH 1/6] chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@1ba8fc47936906417722c9f3e2adeb5f77f3845d Reference-to: stackabletech/operator-templating@1ba8fc4 (Telemetry support for Helm) --- .../templates/_telemetry.tpl | 59 +++++++++++++++++++ nix/README.md | 2 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 deploy/helm/listener-operator/templates/_telemetry.tpl diff --git a/deploy/helm/listener-operator/templates/_telemetry.tpl b/deploy/helm/listener-operator/templates/_telemetry.tpl new file mode 100644 index 00000000..ec49f788 --- /dev/null +++ b/deploy/helm/listener-operator/templates/_telemetry.tpl @@ -0,0 +1,59 @@ +{{/* +Create a list of telemetry related env vars. +*/}} +{{- define "telemetry.envVars" -}} +{{- with .Values.telemetry }} +{{- if not .consoleLog.enabled }} +- name: CONSOLE_LOG_DISABLED + value: "true" +{{- end }} +{{- if .consoleLog.level }} +- name: CONSOLE_LOG_LEVEL + value: {{ .consoleLog.level }} +{{ end }} +{{- if .consoleLog.format }} +- name: CONSOLE_LOG_FORMAT + value: {{ .consoleLog.format }} +{{ end }} +{{- if .fileLog.enabled }} +- name: FILE_LOG_DIRECTORY + value: /stackable/logs/{{ include "operator.appname" $ }} +{{- end }} +{{- if .fileLog.level }} +- name: FILE_LOG_LEVEL + value: {{ .fileLog.level }} +{{- end }} +{{- if .fileLog.rotationPeriod }} +- name: FILE_LOG_ROTATION_PERIOD + value: {{ .fileLog.rotationPeriod }} +{{- end }} +{{- if .fileLog.maxFiles }} +- name: FILE_LOG_MAX_FILES + value: {{ .fileLog.maxFiles }} +{{- end }} +{{- if .otelLogExporter.enabled }} +- name: OTEL_LOG_EXPORTER_ENABLED + value: "true" +{{- end }} +{{- if .otelLogExporter.level }} +- name: OTEL_LOG_EXPORTER_LEVEL + value: {{ .otelLogExporter.level }} +{{- end }} +{{- if .otelLogExporter.endpoint }} +- name: OTEL_EXPORTER_OTLP_LOGS_ENDPOINT + value: {{ .otelLogExporter.endpoint }} +{{- end }} +{{- if .otelTraceExporter.enabled }} +- name: OTEL_TRACE_EXPORTER_ENABLED + value: "true" +{{- end }} +{{- if .otelTraceExporter.level }} +- name: OTEL_TRACE_EXPORTER_LEVEL + value: {{ .otelTraceExporter.level }} +{{- end }} +{{- if .otelTraceExporter.endpoint }} +- name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: {{ .otelTraceExporter.endpoint }} +{{- end }} +{{- end }} +{{- end }} diff --git a/nix/README.md b/nix/README.md index d3245031..a74e2402 100644 --- a/nix/README.md +++ b/nix/README.md @@ -13,7 +13,7 @@ DO NOT MANUALLY EDIT THIS FILE ```shell niv update crate2nix niv update nixpkgs -niv update beky.py -b X.Y.Z # Using the release tag +niv update beku.py -b X.Y.Z # Using the release tag ``` ### Test From a1e0bd0d52dd249476415b85a55e01f13cdf0ba9 Mon Sep 17 00:00:00 2001 From: Techassi Date: Tue, 15 Apr 2025 12:24:02 +0200 Subject: [PATCH 2/6] fix: Bump crossbeam-channel to 0.5.15 This fixes RUSTSEC-2025-0024. --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2a614bec..69118d2b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -521,9 +521,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.14" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" dependencies = [ "crossbeam-utils", ] From 8c090d8ad9e20565017f178a83351750864b73c4 Mon Sep 17 00:00:00 2001 From: Techassi Date: Tue, 15 Apr 2025 12:25:59 +0200 Subject: [PATCH 3/6] fix: Bump tokio to 1.44.2 This fixes RUSTSEC-2025-0023. --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 69118d2b..6c410fee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2987,9 +2987,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.43.0" +version = "1.44.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" +checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" dependencies = [ "backtrace", "bytes", From 119d0fcf4514074494a94ef03ec689b2f9154a42 Mon Sep 17 00:00:00 2001 From: Techassi Date: Tue, 15 Apr 2025 14:23:10 +0200 Subject: [PATCH 4/6] chore(helm): Add default telemetry values --- deploy/helm/listener-operator/values.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/deploy/helm/listener-operator/values.yaml b/deploy/helm/listener-operator/values.yaml index fcd258d2..5e4c1008 100644 --- a/deploy/helm/listener-operator/values.yaml +++ b/deploy/helm/listener-operator/values.yaml @@ -104,3 +104,16 @@ kubeletDir: /var/lib/kubelet # stable-nodes: ListenerClasses are preinstalled that are suitable for on-prem/"pet" environments, assuming long-running Nodes but not requiring a LoadBalancer controller # ephemeral-nodes: ListenerClasses are preinstalled that are suitable for cloud/"cattle" environments with short-lived nodes, however this requires a LoadBalancer controller to be installed preset: stable-nodes + +# See all available options and detailed explanations about the concept here: +# https://docs.stackable.tech/home/stable/concepts/telemetry/ +telemetry: + consoleLog: + enabled: true + fileLog: + enabled: true + rotationPeriod: hourly + otelLogExporter: + enabled: false + otelTraceExporter: + enabled: false From 20dac7a51b21a10dcbe3586060f52efbc371dbfc Mon Sep 17 00:00:00 2001 From: Techassi Date: Tue, 15 Apr 2025 15:00:19 +0200 Subject: [PATCH 5/6] chore(helm): Disable fileLog by default, set maxFiles to 6 --- deploy/helm/listener-operator/values.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deploy/helm/listener-operator/values.yaml b/deploy/helm/listener-operator/values.yaml index 5e4c1008..5e80f4ce 100644 --- a/deploy/helm/listener-operator/values.yaml +++ b/deploy/helm/listener-operator/values.yaml @@ -111,8 +111,9 @@ telemetry: consoleLog: enabled: true fileLog: - enabled: true + enabled: false rotationPeriod: hourly + maxFiles: 6 otelLogExporter: enabled: false otelTraceExporter: From 963ae4952f7b6ff571a8075515855c3f4ac64e3f Mon Sep 17 00:00:00 2001 From: Techassi Date: Tue, 15 Apr 2025 15:57:23 +0200 Subject: [PATCH 6/6] chore(helm): Add telemetry env vars to Deployment and DaemonSet --- .../helm/listener-operator/templates/controller-deployment.yaml | 1 + deploy/helm/listener-operator/templates/node-daemonset.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/deploy/helm/listener-operator/templates/controller-deployment.yaml b/deploy/helm/listener-operator/templates/controller-deployment.yaml index 47ec3b80..5d0e6206 100644 --- a/deploy/helm/listener-operator/templates/controller-deployment.yaml +++ b/deploy/helm/listener-operator/templates/controller-deployment.yaml @@ -46,6 +46,7 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: {{ .Values.kubernetesClusterDomain | quote }} {{- end }} + {{- include "telemetry.envVars" . | nindent 12 }} volumeMounts: - name: csi mountPath: /csi diff --git a/deploy/helm/listener-operator/templates/node-daemonset.yaml b/deploy/helm/listener-operator/templates/node-daemonset.yaml index 545647c6..9f69b7fa 100644 --- a/deploy/helm/listener-operator/templates/node-daemonset.yaml +++ b/deploy/helm/listener-operator/templates/node-daemonset.yaml @@ -50,6 +50,7 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: {{ .Values.kubernetesClusterDomain | quote }} {{- end }} + {{- include "telemetry.envVars" . | nindent 12 }} volumeMounts: - name: csi mountPath: /csi