Skip to content

Commit 5b22621

Browse files
rogercollmergify[bot]
authored andcommitted
fix: spec invalid rendered values "null" (#11481)
* fix: spec invalid rendered values "null" * chore: add fragments * update helm to v4 * fix: k8s_events empty config * rollback go mod changes * rollback licenses (cherry picked from commit 6a7cd38) # Conflicts: # deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml # deploy/helm/edot-collector/kube-stack/values.yaml
1 parent 86d274b commit 5b22621

File tree

4 files changed

+46
-3
lines changed

4 files changed

+46
-3
lines changed
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Kind can be one of:
2+
# - breaking-change: a change to previously-documented behavior
3+
# - deprecation: functionality that is being removed in a later release
4+
# - bug-fix: fixes a problem in a previous version
5+
# - enhancement: extends functionality but does not break or fix existing behavior
6+
# - feature: new functionality
7+
# - known-issue: problems that we are aware of in a given version
8+
# - security: impacts on the security of a product or a user’s deployment.
9+
# - upgrade: important information for someone upgrading from a prior version
10+
# - other: does not fit into any of the other categories
11+
kind: bug-fix
12+
13+
# Change summary; a 80ish characters long description of the change.
14+
summary: fix kube-stack null template evaluation for Helm v4
15+
16+
# Long description; in case the summary is not enough to describe the change
17+
# this field accommodate a description without length limits.
18+
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
19+
#description:
20+
21+
# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
22+
component:
23+
24+
# PR URL; optional; the PR number that added the changeset.
25+
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
26+
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
27+
# Please provide it if you are adding a fragment for a different PR.
28+
#pr: https://github.com/owner/repo/1234
29+
30+
# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
31+
# If not present is automatically filled by the tooling with the issue linked to the PR number.
32+
#issue: https://github.com/owner/repo/1234

deploy/helm/edot-collector/kube-stack/managed_otlp/logs-values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ collectors:
233233
endpoint: ${env:MY_POD_IP}:4317
234234
http:
235235
endpoint: ${env:MY_POD_IP}:4318
236-
processors:
236+
processors: {}
237237
exporters:
238238
debug:
239239
otlp/ingest:

deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,11 @@ collectors:
129129
key: app.kubernetes.io/version
130130
from: pod
131131
receivers:
132+
<<<<<<< HEAD
133+
=======
134+
# [K8s Events Receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/k8seventsreceiver)
135+
k8s_events: {}
136+
>>>>>>> 6a7cd38f5 (fix: spec invalid rendered values "null" (#11481))
132137
# [K8s Objects Receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/k8sobjectsreceiver)
133138
k8sobjects:
134139
objects:
@@ -582,7 +587,7 @@ collectors:
582587
endpoint: ${env:MY_POD_IP}:4317
583588
http:
584589
endpoint: ${env:MY_POD_IP}:4318
585-
processors:
590+
processors: {}
586591
exporters:
587592
debug:
588593
otlp/ingest_logs:

deploy/helm/edot-collector/kube-stack/values.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,11 @@ collectors:
109109
- "service.name"
110110
- "service.version"
111111
receivers:
112+
<<<<<<< HEAD
113+
=======
114+
# [K8s Events Receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/k8seventsreceiver)
115+
k8s_events: {}
116+
>>>>>>> 6a7cd38f5 (fix: spec invalid rendered values "null" (#11481))
112117
# [K8s Objects Receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/k8sobjectsreceiver)
113118
k8sobjects:
114119
objects:
@@ -627,7 +632,7 @@ collectors:
627632
metrics/aggregated-otel-metrics:
628633
receivers:
629634
- elasticapm
630-
processors:
635+
processors: []
631636
exporters:
632637
- debug
633638
- elasticsearch/otel
@@ -636,6 +641,7 @@ collectors:
636641
instrumentation:
637642
name: elastic-instrumentation
638643
enabled: true # Enable/disable auto-instrumentation.
644+
env: []
639645
exporter:
640646
endpoint: http://opentelemetry-kube-stack-daemon-collector.opentelemetry-operator-system.svc.cluster.local:4318 # The daemonset OpenTelemetry Collector endpoint where telemetry data will be exported.
641647
propagators:

0 commit comments

Comments
 (0)