Add an option to mount extra volumes to the daemonset

signalfx · May 25, 2021 · d2b2d49 · d2b2d49
1 parent e68cae0
commit d2b2d49
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [0.26.1] - 2021-05-25
+
+### Added
+
+- Add an option to mount extra volumes using `otelAgent.extraVolumes` and `otelAgent.extraVolumeMounts` (#151)
+
 ## [0.26.0] - 2021-05-21
 
 ### Added

diff --git a/helm-charts/splunk-otel-collector/Chart.yaml b/helm-charts/splunk-otel-collector/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: splunk-otel-collector
-version: 0.26.0
+version: 0.26.1
 description: Splunk OpenTelemetry Connector for Kubernetes
 icon: https://github.com/signalfx/splunk-otel-collector-chart/tree/main/splunk.png
 type: application

diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml
@@ -176,6 +176,9 @@ spec:
           readOnly: true
           mountPropagation: HostToContainer
         {{- end }}
+        {{- if .Values.otelAgent.extraVolumeMounts }}
+        {{- toYaml .Values.otelAgent.extraVolumeMounts | nindent 8 }}
+        {{- end }}
       terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
       volumes:
       {{- if .Values.logsEnabled }}
@@ -206,6 +209,9 @@ spec:
           items:
             - key: relay
               path: relay.yaml
+      {{- if .Values.otelAgent.extraVolumes }}
+      {{- toYaml .Values.otelAgent.extraVolumes | nindent 6 }}
+      {{- end }}
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName }}
       {{- end }}

diff --git a/helm-charts/splunk-otel-collector/values.yaml b/helm-charts/splunk-otel-collector/values.yaml
@@ -147,6 +147,11 @@ otelAgent:
   # Extra enviroment variables to be set in the OTel agent container
   extraEnvs: []
 
+  # Extra volumes to be mounted to the agent daemonset.
+  # The volumes will be available for both OTel agent and fluentd containers.
+  extraVolumes: []
+  extraVolumeMounts: []
+
   # OpenTelemetry Collector configuration for otel-agent daemonset can be overriden in this field.
   # Default configuration defined in config/otel-agent-config.yaml
   # Any additional fields will be merged into the defaults,