Skip to content

Commit abec0c1

Browse files
mergify[bot]rogercoll
mergify[bot]
and
rogercoll
authored
[otel/kube-stack] Update the OpenTelemetry Kube Stack Helm Chart to v0.12.4 (#11541) (#11593)
* chore: Update tested OpenTelemetry Kube Stack Helm Chart in k8s.go Made with ❤️️ by updatecli * chore: Update local OpenTelemetry Kube Stack Helm Chart files Made with ❤️️ by updatecli (cherry picked from commit 365ec97) Co-authored-by: Roger Coll <[email protected]>
1 parent b02ba5a commit abec0c1

File tree

11 files changed

+89
-17
lines changed

11 files changed

+89
-17
lines changed

‎testing/integration/k8s/k8s.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package k8s
77
import "path/filepath"
88

99
const (
10-
KubeStackChartVersion = "0.11.1"
10+
KubeStackChartVersion = "0.12.4"
1111
KubeStackChartName = "opentelemetry-kube-stack"
1212
KubeStackChartNameWithVersion = KubeStackChartName + "-" + KubeStackChartVersion
1313
KubeStackChartArchiveName = KubeStackChartNameWithVersion + ".tgz"

‎testing/integration/k8s/testdata/opentelemetry-kube-stack/Chart.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ dependencies:
77
version: 0.0.0
88
- name: opentelemetry-operator
99
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
10-
version: 0.97.1
10+
version: 0.99.0
1111
- name: kube-state-metrics
1212
repository: https://prometheus-community.github.io/helm-charts
1313
version: 6.3.0
1414
- name: prometheus-node-exporter
1515
repository: https://prometheus-community.github.io/helm-charts
1616
version: 4.48.0
17-
digest: sha256:5eacf19a8cffc4f333b0e287fabbb387fc31d2b8315a77a918783b9906bd7e32
18-
generated: "2025-10-02T13:49:24.548948-06:00"
17+
digest: sha256:9c04376f480118910fe4bb39bd64f8b6cde8ade4b76fb43fcecc2bfcbee838b3
18+
generated: "2025-11-05T22:11:01.225203082+01:00"

‎testing/integration/k8s/testdata/opentelemetry-kube-stack/Chart.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: 0.129.1
2+
appVersion: 0.138.0
33
dependencies:
44
- condition: crds.install,crds.installOtel
55
name: otel-crds
@@ -12,7 +12,7 @@ dependencies:
1212
- condition: opentelemetry-operator.enabled
1313
name: opentelemetry-operator
1414
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
15-
version: 0.97.1
15+
version: 0.99.0
1616
- condition: kubeStateMetrics.enabled
1717
name: kube-state-metrics
1818
repository: https://prometheus-community.github.io/helm-charts
@@ -34,4 +34,4 @@ name: opentelemetry-kube-stack
3434
sources:
3535
- https://github.com/open-telemetry/opentelemetry-operator
3636
type: application
37-
version: 0.11.1
37+
version: 0.12.4

‎testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: 0.136.0
2+
appVersion: 0.138.0
33
description: OpenTelemetry Operator Helm chart for Kubernetes
44
home: https://opentelemetry.io/
55
icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png
@@ -12,4 +12,4 @@ name: opentelemetry-operator
1212
sources:
1313
- https://github.com/open-telemetry/opentelemetry-operator
1414
type: application
15-
version: 0.97.1
15+
version: 0.99.0

‎testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/ci/feature-gates-values.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ manager:
33
repository: "otel/opentelemetry-collector-k8s"
44
featureGatesMap:
55
operator.targetallocator.mtls: true
6-
operator.collector.targetallocatorcr: false

‎testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/conf/crds/crd-opentelemetry.io_targetallocators.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,6 +1174,8 @@ spec:
11741174
default: 30s
11751175
format: duration
11761176
type: string
1177+
dnsPolicy:
1178+
type: string
11771179
env:
11781180
items:
11791181
properties:
@@ -2244,6 +2246,8 @@ spec:
22442246
type: string
22452247
hostPort:
22462248
format: int32
2249+
maximum: 65535
2250+
minimum: 0
22472251
type: integer
22482252
name:
22492253
type: string

‎testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5790,6 +5790,7 @@ spec:
57905790
type: object
57915791
maxReplicas:
57925792
format: int32
5793+
minimum: 1
57935794
type: integer
57945795
metrics:
57955796
items:
@@ -5863,12 +5864,15 @@ spec:
58635864
type: array
58645865
minReplicas:
58655866
format: int32
5867+
minimum: 1
58665868
type: integer
58675869
targetCPUUtilization:
58685870
format: int32
5871+
minimum: 1
58695872
type: integer
58705873
targetMemoryUtilization:
58715874
format: int32
5875+
minimum: 1
58725876
type: integer
58735877
type: object
58745878
config:
@@ -5979,6 +5983,8 @@ spec:
59795983
type:
59805984
type: string
59815985
type: object
5986+
dnsPolicy:
5987+
type: string
59825988
env:
59835989
items:
59845990
properties:
@@ -6933,21 +6939,27 @@ spec:
69336939
properties:
69346940
failureThreshold:
69356941
format: int32
6942+
minimum: 1
69366943
type: integer
69376944
initialDelaySeconds:
69386945
format: int32
6946+
minimum: 0
69396947
type: integer
69406948
periodSeconds:
69416949
format: int32
6950+
minimum: 1
69426951
type: integer
69436952
successThreshold:
69446953
format: int32
6954+
minimum: 1
69456955
type: integer
69466956
terminationGracePeriodSeconds:
69476957
format: int64
6958+
minimum: 1
69486959
type: integer
69496960
timeoutSeconds:
69506961
format: int32
6962+
minimum: 1
69516963
type: integer
69526964
type: object
69536965
managementState:
@@ -7119,6 +7131,8 @@ spec:
71197131
type: string
71207132
hostPort:
71217133
format: int32
7134+
maximum: 65535
7135+
minimum: 0
71227136
type: integer
71237137
name:
71247138
type: string
@@ -7147,21 +7161,27 @@ spec:
71477161
properties:
71487162
failureThreshold:
71497163
format: int32
7164+
minimum: 1
71507165
type: integer
71517166
initialDelaySeconds:
71527167
format: int32
7168+
minimum: 0
71537169
type: integer
71547170
periodSeconds:
71557171
format: int32
7172+
minimum: 1
71567173
type: integer
71577174
successThreshold:
71587175
format: int32
7176+
minimum: 1
71597177
type: integer
71607178
terminationGracePeriodSeconds:
71617179
format: int64
7180+
minimum: 1
71627181
type: integer
71637182
timeoutSeconds:
71647183
format: int32
7184+
minimum: 1
71657185
type: integer
71667186
type: object
71677187
replicas:
@@ -7279,6 +7299,33 @@ spec:
72797299
type: string
72807300
shareProcessNamespace:
72817301
type: boolean
7302+
startupProbe:
7303+
properties:
7304+
failureThreshold:
7305+
format: int32
7306+
minimum: 1
7307+
type: integer
7308+
initialDelaySeconds:
7309+
format: int32
7310+
minimum: 0
7311+
type: integer
7312+
periodSeconds:
7313+
format: int32
7314+
minimum: 1
7315+
type: integer
7316+
successThreshold:
7317+
format: int32
7318+
minimum: 1
7319+
type: integer
7320+
terminationGracePeriodSeconds:
7321+
format: int64
7322+
minimum: 1
7323+
type: integer
7324+
timeoutSeconds:
7325+
format: int32
7326+
minimum: 1
7327+
type: integer
7328+
type: object
72827329
targetAllocator:
72837330
properties:
72847331
affinity:

‎testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ manager:
5050
imagePullPolicy: IfNotPresent
5151
collectorImage:
5252
repository: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s
53-
tag: 0.136.0
53+
tag: 0.138.0
5454
opampBridgeImage:
5555
repository: ""
5656
tag: ""

‎testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/_config.tpl‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,20 @@ receivers:
172172
cpu:
173173
metrics:
174174
system.cpu.utilization:
175-
enabled: true
175+
enabled: true
176+
system.cpu.logical.count:
177+
enabled: true
176178
load: {}
177179
memory:
178180
metrics:
179181
system.memory.utilization:
180-
enabled: true
182+
enabled: true
183+
system.memory.limit:
184+
enabled: true
185+
paging:
186+
metrics:
187+
system.paging.usage:
188+
enabled: true
181189
disk: {}
182190
filesystem:
183191
metrics:
@@ -220,20 +228,27 @@ receivers:
220228
- tracefs
221229
match_type: strict
222230
network: {}
231+
system:
232+
metrics:
233+
system.uptime:
234+
enabled: true
223235
{{- end }}
224236
225237
{{- define "opentelemetry-kube-stack.collector.applyClusterMetricsConfig" -}}
226238
{{- $electorName := "k8s_cluster" }}
227239
{{- $config := mustMergeOverwrite (include "opentelemetry-kube-stack.collector.clusterMetricsConfig" (dict "collector" .collector "namespace" .namespace "electorName" $electorName) | fromYaml) .collector.config }}
228240
{{- if and (dig "service" "pipelines" "metrics" false $config) (not (has "k8s_cluster" (dig "service" "pipelines" "metrics" "receivers" list $config))) }}
229241
{{- $_ := set $config.service.pipelines.metrics "receivers" (append ($config.service.pipelines.metrics.receivers | default list) "k8s_cluster" | uniq) }}
242+
{{- $disableLeaderElection := .collector.presets.clusterMetrics.disableLeaderElection }}
243+
{{- if not $disableLeaderElection }}
230244
{{- $_ := set $config.service "extensions" (append ($config.service.extensions | default list) (printf "k8s_leader_elector/%s" $electorName) | uniq) }}
231245
{{- end }}
246+
{{- end }}
232247
{{- $config | toYaml }}
233248
{{- end }}
234249
235250
{{- define "opentelemetry-kube-stack.collector.clusterMetricsConfig" -}}
236-
{{- $disableLeaderElection := .collector.presets.kubernetesEvents.disableLeaderElection}}
251+
{{- $disableLeaderElection := .collector.presets.clusterMetrics.disableLeaderElection}}
237252
{{- if not $disableLeaderElection}}
238253
{{- include "opentelemetry-kube-stack.collector.leaderElectionConfig" (dict "name" .electorName "leaseName" "k8s.cluster.receiver.opentelemetry.io" "leaseNamespace" .namespace)}}
239254
{{- end}}
@@ -336,8 +351,11 @@ receivers:
336351
{{- $config := mustMergeOverwrite (include "opentelemetry-kube-stack.collector.kubernetesEventsConfig" (dict "collector" .collector "namespace" .namespace "electorName" $electorName) | fromYaml) .collector.config }}
337352
{{- if and (dig "service" "pipelines" "logs" false $config) (not (has "k8sobjects" (dig "service" "pipelines" "logs" "receivers" list $config))) }}
338353
{{- $_ := set $config.service.pipelines.logs "receivers" (append ($config.service.pipelines.logs.receivers | default list) "k8sobjects" | uniq) }}
354+
{{- $disableLeaderElection := .collector.presets.kubernetesEvents.disableLeaderElection }}
355+
{{- if not $disableLeaderElection }}
339356
{{- $_ := set $config.service "extensions" (append ($config.service.extensions | default list) (printf "k8s_leader_elector/%s" $electorName) | uniq) }}
340357
{{- end }}
358+
{{- end }}
341359
{{- $config | toYaml }}
342360
{{- end }}
343361

‎testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/instrumentation.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@ spec:
2020
sampler:
2121
{{- toYaml . | nindent 4 }}
2222
{{- end }}
23+
{{- $envOutput := include "opentelemetry-kube-stack.renderenvs" (dict "extraEnvs" $.Values.extraEnvs "env" .Values.instrumentation.env) | trim -}}
24+
{{- if $envOutput }}
2325
env:
24-
{{- include "opentelemetry-kube-stack.renderenvs" (dict "extraEnvs" $.Values.extraEnvs "env" .Values.instrumentation.env) | indent 4 }}
26+
{{- $envOutput | nindent 4 }}
27+
{{- end }}
2528
{{- with .Values.instrumentation.resource }}
2629
resource:
2730
{{- toYaml . | nindent 4 }}

0 commit comments

Comments
 (0)