changes following tests

logzio · Nov 26, 2024 · be6216a · be6216a
1 parent 860269f
commit be6216a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/charts/logzio-apm-collector/Chart.yaml b/charts/logzio-apm-collector/Chart.yaml
@@ -13,4 +13,4 @@ dependencies:
 maintainers:
   - name: Naama Bendalak
     email: [email protected]
-appVersion: 0.110.0
+appVersion: 0.113.0
diff --git a/charts/logzio-apm-collector/templates/_config.tpl b/charts/logzio-apm-collector/templates/_config.tpl
@@ -37,9 +37,9 @@
 {{- if .Values.spm.enabled }}
 {{- $tracesConfig := deepCopy .Values.traceConfig }}
 {{- $spmForwarderConfig := deepCopy .Values.spmForwarderConfig }}
-{{- ($tracesConfig | merge $spmForwarderConfig | mustMergeOverwrite) | toYaml }}
+{{- tpl (($tracesConfig | merge $spmForwarderConfig | mustMergeOverwrite) | toYaml) . }}
 {{- else }}
-{{- .Values.traceConfig | toYaml }}
+{{- tpl (.Values.traceConfig | toYaml) . }}
 {{- end}}
 {{- end }}
 
@@ -51,8 +51,8 @@
 {{- $mergedConfig := merge $spmConfig $serviceGraphConfig }}
 {{- $_ := set (index $mergedConfig "service" "pipelines" "metrics/spm-logzio") "receivers" (concat (index $mergedConfig "service" "pipelines" "metrics/spm-logzio" "receivers") (index $serviceGraphConfig "service" "pipelines" "metrics/spm-logzio" "receivers" )) -}}
 {{- $_ := set (index $mergedConfig "service" "pipelines" "traces") "exporters" (concat (index $mergedConfig "service" "pipelines" "traces" "exporters") (index $serviceGraphConfig "service" "pipelines" "traces" "exporters" )) -}}
-{{- $mergedConfig | toYaml }}
+{{- tpl ($mergedConfig | toYaml) . }}
 {{- else }}
-{{- .Values.spmConfig | toYaml }}
+{{- tpl (.Values.spmConfig | toYaml) . }}
 {{- end }}
 {{- end }}
diff --git a/charts/logzio-apm-collector/templates/_helpers.tpl b/charts/logzio-apm-collector/templates/_helpers.tpl
@@ -147,7 +147,6 @@ The APM service address
 {{- printf "http://%s.%s.svc.cluster.local" $serviceName .Release.Namespace }}
 {{- end }}
 
-
 {{/*
 Get secret value either from the global section (parent chart is running) or the default sub chart section
 */}}
@@ -162,7 +161,6 @@ Get secret value either from the global section (parent chart is running) or the
 {{- end -}}
 {{- end -}}
 
-
 {{/* Helm hooks annotations for otel operator */}}
 {{- define "apm-collector.otelOpAnnotations" -}}
 helm.sh/hook: "post-install, post-upgrade"

diff --git a/charts/logzio-apm-collector/values.yaml b/charts/logzio-apm-collector/values.yaml
@@ -73,6 +73,10 @@ otel-operator:
     ## Path to the CA cert.
     # caFile: ""
 
+    # The OpenTelemetry Operator webhook service may not always be ready in time, causing an error.
+    # to retry, we set `failurePolicy` to `ignore`. To block the operation if it fails, set to `Fail`.
+    failurePolicy: Ignore
+
   # Deploying the collector using the operator is not supported currently.
   # The collector image is specified to meet operator subchart requirments.
   manager:
@@ -290,6 +294,9 @@ spmConfig:
         user-agent: "{{ .Chart.Name }}-{{ .Chart.Version }}-helm"
       timeout: 30s  # Time to wait per attempt to send data
       add_metric_suffixes: false
+  extensions:
+    health_check:
+      endpoint: :13133
   receivers:
     otlp:
       protocols:
@@ -359,6 +366,7 @@ spmConfig:
         - telemetry.sdk.language
         - telemetry.sdk.name
   service:
+    extensions: [health_check]
     pipelines:
       traces:
         receivers: [otlp]