update comment and move logic to template

open-telemetry · Apr 22, 2024 · c0fd7da · c0fd7da
1 parent 55ee9bd
commit c0fd7da
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/charts/opentelemetry-collector/templates/_helpers.tpl b/charts/opentelemetry-collector/templates/_helpers.tpl
@@ -214,3 +214,15 @@ The capitalization is important for StatefulSet.
 {{- print "StatefulSet" -}}
 {{- end -}}
 {{- end }}
+
+{{/*
+Get ConfigMap name if existingName is defined, otherwise use default name for generated config.
+*/}}
+{{- define "opentelemetry-collector.configName" -}}
+  {{- if .Values.configMap.existingName -}}
+    {{ .Values.configMap.existingName }}
+  {{- else }}
+    {{- printf "%s%s" (include "opentelemetry-collector.fullname" .) (.configmapSuffix) }}
+  {{- end -}}
+{{- end }}
+
diff --git a/charts/opentelemetry-collector/templates/_pod.tpl b/charts/opentelemetry-collector/templates/_pod.tpl
@@ -151,7 +151,7 @@ volumes:
   {{- if or .Values.configMap.create .Values.configMap.existingName }}
   - name: {{ include "opentelemetry-collector.lowercase_chartname" . }}-configmap
     configMap:
-      name: {{ .Values.configMap.existingName | default (printf "%s%s" (include "opentelemetry-collector.fullname" .) (.configmapSuffix)) }}
+      name: {{ include "opentelemetry-collector.configName" . }}
       items:
         - key: relay
           path: relay.yaml

diff --git a/charts/opentelemetry-collector/values.yaml b/charts/opentelemetry-collector/values.yaml
@@ -80,7 +80,8 @@ presets:
 configMap:
   # Specifies whether a configMap should be created (true by default)
   create: true
-  # Specifies an existing configMap to be mounted to the pod
+  # Specifies an existing configMap to be mounted to the pod which should contain an item with key 'relay' and path 'relay.yaml'. 
+  # These settings will be used to properly configure the collector. 
   existingName: ""
 
 # Base collector configuration.