Allow to mount extra volumes for agent & deployment (#589)

SigNoz · Jan 2, 2025 · 1911336 · 1911336
1 parent cd1edcb
commit 1911336
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 1 deletion.
diff --git a/charts/k8s-infra/Chart.yaml b/charts/k8s-infra/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: k8s-infra
 description: Helm chart for collecting metrics and logs in K8s
 type: application
-version: 0.11.19
+version: 0.11.20
 appVersion: "0.109.0"
 home: https://signoz.io
 icon: https://signoz.io/img/SigNozLogo-orange.svg

diff --git a/charts/k8s-infra/templates/otel-agent/daemonset.yaml b/charts/k8s-infra/templates/otel-agent/daemonset.yaml
@@ -69,6 +69,9 @@ spec:
              - key: key.pem
                path: key.pem
         {{- end }}
+        {{- with .Values.otelAgent.extraVolumes }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       containers:
         - name: {{ include "otelAgent.fullname" . }}
           image: {{ include "otelAgent.image" . }}
@@ -133,6 +136,9 @@ spec:
             - name: {{ include "k8s-infra.fullname" . }}-agent-secrets-vol
               mountPath: {{ default "/secrets" .Values.otelTlsSecrets.path }}
             {{- end }}
+            {{- with .Values.otelAgent.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
           {{- if .Values.otelAgent.livenessProbe.enabled }}
           livenessProbe:
             {{- with .Values.otelAgent.livenessProbe }}

diff --git a/charts/k8s-infra/templates/otel-deployment/deployment.yaml b/charts/k8s-infra/templates/otel-deployment/deployment.yaml
@@ -62,6 +62,9 @@ spec:
               - key: key.pem
                 path: key.pem
         {{- end }}
+        {{- with .Values.otelDeployment.extraVolumes }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       containers:
         - name: {{ template "otelDeployment.fullname" . }}
           image: {{ template "otelDeployment.image" . }}
@@ -105,6 +108,9 @@ spec:
             - name: {{ include "k8s-infra.fullname" . }}-deployment-secrets-vol
               mountPath: {{ default "/secrets" .Values.otelTlsSecrets.path }}
             {{- end }}
+            {{- with .Values.otelDeployment.extraVolumeMounts }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
           {{- if .Values.otelDeployment.livenessProbe.enabled }}
           livenessProbe:
             {{- with .Values.otelDeployment.livenessProbe }}

diff --git a/charts/k8s-infra/values.yaml b/charts/k8s-infra/values.yaml
@@ -667,6 +667,23 @@ otelAgent:
           processors: [batch]
           exporters: []
 
+  # -- Additional volumes for otelAgent
+  extraVolumes: []
+  # - name: config-volume
+  #   configMap:
+  #     name: special-config
+  # - name: secret-volume
+  #   secret:
+  #     secretName: special-secret
+
+  # -- Additional volume mounts for otelAgent
+  extraVolumeMounts: []
+  # - name: config-volume
+  #   mountPath: /etc/config
+  # - name: secret-volume
+  #   mountPath: /etc/secret
+  #   readOnly: true
+
 # Default values for OtelDeployment
 otelDeployment:
   enabled: true
@@ -957,3 +974,20 @@ otelDeployment:
           receivers: []
           processors: [batch]
           exporters: []
+
+  # -- Additional volumes for otelDeployment
+  extraVolumes: []
+  # - name: config-volume
+  #   configMap:
+  #     name: special-config
+  # - name: secret-volume
+  #   secret:
+  #     secretName: special-secret
+
+  # -- Additional volume mounts for otelDeployment
+  extraVolumeMounts: []
+  # - name: config-volume
+  #   mountPath: /etc/config
+  # - name: secret-volume
+  #   mountPath: /etc/secret
+  #   readOnly: true