diff --git a/charts/kube-otel-stack/templates/_helpers.tpl b/charts/kube-otel-stack/templates/_helpers.tpl index 60601cd..896fad0 100644 --- a/charts/kube-otel-stack/templates/_helpers.tpl +++ b/charts/kube-otel-stack/templates/_helpers.tpl @@ -112,23 +112,6 @@ If release name contains chart name it will be used as a full name. {{- end }} {{- end }} -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "opentelemetry-collector.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "opentelemetry-opamp-bridge.labels" -}} -helm.sh/chart: {{ include "opentelemetry-collector.chart" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} {{/* Create the name of the clusterRole to use for the opampbridge diff --git a/charts/kube-otel-stack/templates/bridge.yaml b/charts/kube-otel-stack/templates/bridge.yaml index c73202a..c931b4f 100644 --- a/charts/kube-otel-stack/templates/bridge.yaml +++ b/charts/kube-otel-stack/templates/bridge.yaml @@ -2,10 +2,9 @@ apiVersion: opentelemetry.io/v1alpha1 kind: OpAMPBridge metadata: - name: {{ include "opentelemetry-opamp-bridge.fullname" . }} + name: {{ include "opentelemetry-opamp-bridge.fullname" $ }} labels: {{- include "kube-otel-stack.labels" $ | indent 4 }} - {{- include "opentelemetry-opamp-bridge.labels" $ | indent 4 }} {{- with $.Values.opAMPBridge.labels }} {{- range $key, $value := . }} {{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}