Skip to content

Commit 1140831

Browse files
dmitryaxdmitryax
authored
Add an option to mount extra volumes to the daemonset (#151)
1 parent e68cae0 commit 1140831

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+62
-45
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
44

5+
## [0.26.1] - 2021-05-25
6+
7+
### Added
8+
9+
- Add an option to mount extra volumes using `otelAgent.extraVolumes` and `otelAgent.extraVolumeMounts` (#151)
10+
511
## [0.26.0] - 2021-05-21
612

713
### Added

‎helm-charts/splunk-otel-collector/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: splunk-otel-collector
3-
version: 0.26.0
3+
version: 0.26.1
44
description: Splunk OpenTelemetry Connector for Kubernetes
55
icon: https://github.com/signalfx/splunk-otel-collector-chart/tree/main/splunk.png
66
type: application

‎helm-charts/splunk-otel-collector/templates/daemonset.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,9 @@ spec:
176176
readOnly: true
177177
mountPropagation: HostToContainer
178178
{{- end }}
179+
{{- if .Values.otelAgent.extraVolumeMounts }}
180+
{{- toYaml .Values.otelAgent.extraVolumeMounts | nindent 8 }}
181+
{{- end }}
179182
terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
180183
volumes:
181184
{{- if .Values.logsEnabled }}
@@ -206,6 +209,9 @@ spec:
206209
items:
207210
- key: relay
208211
path: relay.yaml
212+
{{- if .Values.otelAgent.extraVolumes }}
213+
{{- toYaml .Values.otelAgent.extraVolumes | nindent 6 }}
214+
{{- end }}
209215
{{- if .Values.priorityClassName }}
210216
priorityClassName: {{ .Values.priorityClassName }}
211217
{{- end }}

‎helm-charts/splunk-otel-collector/values.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,11 @@ otelAgent:
147147
# Extra enviroment variables to be set in the OTel agent container
148148
extraEnvs: []
149149

150+
# Extra volumes to be mounted to the agent daemonset.
151+
# The volumes will be available for both OTel agent and fluentd containers.
152+
extraVolumes: []
153+
extraVolumeMounts: []
154+
150155
# OpenTelemetry Collector configuration for otel-agent daemonset can be overriden in this field.
151156
# Default configuration defined in config/otel-agent-config.yaml
152157
# Any additional fields will be merged into the defaults,

‎rendered/manifests/agent-only/clusterRole.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: default-splunk-otel-collector
77
labels:
88
app: splunk-otel-collector
9-
chart: splunk-otel-collector-0.26.0
9+
chart: splunk-otel-collector-0.26.1
1010
release: default
1111
heritage: Helm
1212
rules:

‎rendered/manifests/agent-only/clusterRoleBinding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: default-splunk-otel-collector
77
labels:
88
app: splunk-otel-collector
9-
chart: splunk-otel-collector-0.26.0
9+
chart: splunk-otel-collector-0.26.1
1010
release: default
1111
heritage: Helm
1212
roleRef:

‎rendered/manifests/agent-only/configmap-fluentd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: default-splunk-otel-collector-fluentd
77
labels:
88
app: splunk-otel-collector
9-
chart: splunk-otel-collector-0.26.0
9+
chart: splunk-otel-collector-0.26.1
1010
release: default
1111
heritage: Helm
1212
data:

‎rendered/manifests/agent-only/configmap-otel-agent.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: default-splunk-otel-collector-otel-agent
77
labels:
88
app: splunk-otel-collector
9-
chart: splunk-otel-collector-0.26.0
9+
chart: splunk-otel-collector-0.26.1
1010
release: default
1111
heritage: Helm
1212
data:

‎rendered/manifests/agent-only/configmap-otel-k8s-cluster-receiver.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: default-splunk-otel-collector-otel-k8s-cluster-receiver
77
labels:
88
app: splunk-otel-collector
9-
chart: splunk-otel-collector-0.26.0
9+
chart: splunk-otel-collector-0.26.1
1010
release: default
1111
heritage: Helm
1212
data:

‎rendered/manifests/agent-only/daemonset.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: default-splunk-otel-collector-agent
77
labels:
88
app: splunk-otel-collector
9-
chart: splunk-otel-collector-0.26.0
9+
chart: splunk-otel-collector-0.26.1
1010
release: default
1111
heritage: Helm
1212
engine: fluentd
@@ -23,7 +23,7 @@ spec:
2323
app: splunk-otel-collector
2424
release: default
2525
annotations:
26-
checksum/config: 66ed856df7c243e4e32583ff2abee07ae9e1e55e28f1f6c0e3db72dbd02587b6
26+
checksum/config: 096aec6f715d06237cc9075d0a56632237e4ab5c7bda8497c086d0de00812c30
2727
spec:
2828
hostNetwork: true
2929
dnsPolicy: ClusterFirstWithHostNet

0 commit comments

Comments
 (0)