Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add an option to mount extra volumes to the daemonset #151

Merged
merged 1 commit into from
May 25, 2021
Merged

Add an option to mount extra volumes to the daemonset #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/splunk-otel-collector/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 6 additions & 0 deletions helm-charts/splunk-otel-collector/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
5 changes: 5 additions & 0 deletions helm-charts/splunk-otel-collector/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/clusterRole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
rules:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/clusterRoleBinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
roleRef:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/configmap-fluentd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector-fluentd
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
data:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/configmap-otel-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector-otel-agent
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
data:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/configmap-otel-k8s-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector-otel-k8s-cluster-receiver
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
data:
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/agent-only/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector-agent
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
engine: fluentd
Expand All @@ -23,7 +23,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: 66ed856df7c243e4e32583ff2abee07ae9e1e55e28f1f6c0e3db72dbd02587b6
checksum/config: 096aec6f715d06237cc9075d0a56632237e4ab5c7bda8497c086d0de00812c30
spec:
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/agent-only/deployment-k8s-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app: splunk-otel-collector
component: otel-k8s-cluster-receiver
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
spec:
Expand All @@ -24,7 +24,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: 79a69a098fb3a5c7a16bbd8a788ba18ecc3aba07c7b0f32be626f0688e185d68
checksum/config: d73f7e37e0cdd96e40fe74885c3d0082dc99414cef66cadd0531eeb94c1a99a3
spec:
serviceAccountName: default-splunk-otel-collector
containers:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: splunk-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
type: Opaque
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/agent-only/serviceAccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ metadata:
name: default-splunk-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
2 changes: 1 addition & 1 deletion rendered/manifests/gateway-only/clusterRole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
rules:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/gateway-only/clusterRoleBinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
roleRef:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/gateway-only/configmap-otel-collector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
data:
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/gateway-only/deployment-collector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app: splunk-otel-collector
component: otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
spec:
Expand All @@ -24,7 +24,7 @@ spec:
component: otel-collector
release: default
annotations:
checksum/config: fc34a45984e6a10e6805c2b32ad198e45f83d4129e55e31e504c7aeac35c6666
checksum/config: 473f5696f58b05f1b0314358aa638ee8b377aad7fd74774e28e031cdc241e89b
spec:
serviceAccountName: default-splunk-otel-collector
containers:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/gateway-only/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: splunk-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
type: Opaque
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/gateway-only/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app: splunk-otel-collector
component: otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
spec:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/gateway-only/serviceAccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ metadata:
name: default-splunk-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
2 changes: 1 addition & 1 deletion rendered/manifests/logs-only/clusterRole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
rules:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/logs-only/clusterRoleBinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
roleRef:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/logs-only/configmap-fluentd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector-fluentd
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
data:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/logs-only/configmap-otel-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector-otel-agent
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
data:
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/logs-only/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector-agent
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
engine: fluentd
Expand All @@ -23,7 +23,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: b3338e4df6327658beeaeb52f6bf4afbe226255f3502462926602f90aaabdcab
checksum/config: 3c98fe31d3707f0a8dbf6f80c7c79047d3b3ae3aff2d8d7120ceabc033ef065a
spec:
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/logs-only/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: splunk-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
type: Opaque
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/logs-only/serviceAccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ metadata:
name: default-splunk-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
2 changes: 1 addition & 1 deletion rendered/manifests/metrics-only/clusterRole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
rules:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/metrics-only/clusterRoleBinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
roleRef:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/metrics-only/configmap-otel-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector-otel-agent
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
data:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/metrics-only/configmap-otel-k8s-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector-otel-k8s-cluster-receiver
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
data:
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/metrics-only/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector-agent
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
spec:
Expand All @@ -22,7 +22,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: b8aa772accbcd951e2fc419e814a38f5dc4585dfda1eab76fda59663b954aad3
checksum/config: e1dda56664642ae464e8c7e45ef3dfb2a8687b7cd99351923d21eb676022649c
spec:
hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet
Expand Down
4 changes: 2 additions & 2 deletions rendered/manifests/metrics-only/deployment-k8s-cluster-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app: splunk-otel-collector
component: otel-k8s-cluster-receiver
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
spec:
Expand All @@ -24,7 +24,7 @@ spec:
component: otel-k8s-cluster-receiver
release: default
annotations:
checksum/config: 79a69a098fb3a5c7a16bbd8a788ba18ecc3aba07c7b0f32be626f0688e185d68
checksum/config: d73f7e37e0cdd96e40fe74885c3d0082dc99414cef66cadd0531eeb94c1a99a3
spec:
serviceAccountName: default-splunk-otel-collector
containers:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/metrics-only/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: splunk-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
type: Opaque
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/metrics-only/serviceAccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ metadata:
name: default-splunk-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
2 changes: 1 addition & 1 deletion rendered/manifests/traces-only/clusterRole.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
rules:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/traces-only/clusterRoleBinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: default-splunk-otel-collector
labels:
app: splunk-otel-collector
chart: splunk-otel-collector-0.26.0
chart: splunk-otel-collector-0.26.1
release: default
heritage: Helm
roleRef:
Expand Down
Loading