File tree Expand file tree Collapse file tree 6 files changed +12
-6
lines changed
testdata/opentelemetry-kube-stack Expand file tree Collapse file tree 6 files changed +12
-6
lines changed Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ package k8s
77import "path/filepath"
88
99const (
10- KubeStackChartVersion = "0.12.4 "
10+ KubeStackChartVersion = "0.12.5 "
1111 KubeStackChartName = "opentelemetry-kube-stack"
1212 KubeStackChartNameWithVersion = KubeStackChartName + "-" + KubeStackChartVersion
1313 KubeStackChartArchiveName = KubeStackChartNameWithVersion + ".tgz"
Original file line number Diff line number Diff line change @@ -34,4 +34,4 @@ name: opentelemetry-kube-stack
3434sources :
3535- https://github.com/open-telemetry/opentelemetry-operator
3636type : application
37- version : 0.12.4
37+ version : 0.12.5
Original file line number Diff line number Diff line change 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 }}
Original file line number Diff line number Diff line change 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 }}
Original file line number Diff line number Diff line change 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---
Original file line number Diff line number Diff 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.
5858defaultCRConfig :
59- enabled : false
59+ enabled : true
6060
6161 # Suffix for the collector pool, by default the release name is prepended
6262 suffix : " collector"
You can’t perform that action at this time.
0 commit comments