Skip to content

Commit fdc6339

Browse files
[otel/kube-stack] Update the OpenTelemetry Kube Stack Helm Chart to latest versions (#11640)
* 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 --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent a8bbcf6 commit fdc6339

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
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.12.4"
10+
KubeStackChartVersion = "0.12.5"
1111
KubeStackChartName = "opentelemetry-kube-stack"
1212
KubeStackChartNameWithVersion = KubeStackChartName + "-" + KubeStackChartVersion
1313
KubeStackChartArchiveName = KubeStackChartNameWithVersion + ".tgz"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ name: opentelemetry-kube-stack
3434
sources:
3535
- https://github.com/open-telemetry/opentelemetry-operator
3636
type: application
37-
version: 0.12.4
37+
version: 0.12.5

testing/integration/k8s/testdata/opentelemetry-kube-stack/templates/NOTES.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{{- range $name, $collector := .Values.collectors }}
2-
{{- $collector := (mergeOverwrite (deepCopy $.Values.defaultCRConfig) $collector) }}
2+
{{- if $.Values.defaultCRConfig.enabled }}
3+
{{- $collector = (mergeOverwrite (deepCopy $.Values.defaultCRConfig) $collector) }}
4+
{{- end }}
35
{{- if $collector.updateStrategy }}
46
[WARNING] Collector '{{ $name }}': the 'updateStrategy' value is no longer supported in OpenTelemetryCollector v1beta1. Please migrate to use the `daemonSetUpdateStrategy` value.
57
{{- end }}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ rules:
5555
{{- end }}
5656
{{ range $_, $collector := $.Values.collectors -}}
5757
{{- if $collector.enabled -}}
58-
{{- $collector := (mergeOverwrite (deepCopy $.Values.defaultCRConfig) $collector) }}
58+
{{- if $.Values.defaultCRConfig.enabled }}
59+
{{- $collector = (mergeOverwrite (deepCopy $.Values.defaultCRConfig) $collector) }}
60+
{{- end }}
5961
{{- $merged := (dict "Template" $.Template "Files" $.Files "Chart" $.Chart "clusterRole" $.Values.clusterRole "collector" $collector "Release" $.Release "fullnameOverride" $.Values.fullnameOverride "presets" $.Values.presets) }}
6062
{{- $fullname := (include "opentelemetry-kube-stack.collectorFullname" $merged) }}
6163
{{- if and $collector.enabled $collector.clusterRoleBinding.enabled }}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{{ range $_, $collector := $.Values.collectors -}}
22
{{- if $collector.enabled -}}
3-
{{- $collector := (mergeOverwrite (deepCopy $.Values.defaultCRConfig) $collector) }}
3+
{{- if $.Values.defaultCRConfig.enabled }}
4+
{{- $collector = (mergeOverwrite (deepCopy $.Values.defaultCRConfig) $collector) }}
5+
{{- end }}
46
{{- $merged := (dict "Template" $.Template "Files" $.Files "Chart" $.Chart "clusterRole" $.Values.clusterRole "collector" $collector "Release" $.Release "fullnameOverride" $.Values.fullnameOverride "presets" $.Values.presets "namespace" (include "opentelemetry-kube-stack.namespace" $) "kubelet" $.Values.kubelet "clusterName" $.Values.clusterName) }}
57
{{- $fullname := (include "opentelemetry-kube-stack.collectorFullname" $merged) }}
68
---

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ opentelemetry-operator:
5656
# This is the default configuration for all collectors generated by the chart.
5757
# Any collectors in the `collectors` are overlayed on top of this configuration.
5858
defaultCRConfig:
59-
enabled: false
59+
enabled: true
6060

6161
# Suffix for the collector pool, by default the release name is prepended
6262
suffix: "collector"

0 commit comments

Comments
 (0)