From 2547b97955dda2cce594d2cbe439209ab1548544 Mon Sep 17 00:00:00 2001
From: Jeremy Clerc <j.clerc@criteo.com>
Date: Thu, 11 Jun 2026 09:58:52 +0200
Subject: [PATCH] Allow extra containers, volumes, ... in the deployment

This allows anyone to add side cares, like one to parse logs written
to disk and index these logs in an internal system.

fix tolerations as is supposed to be an array.
---
 chart/templates/deployment.yaml | 17 +++++++++++++++++
 chart/values.yaml               |  7 ++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index 1fafb0c..bd32cec 100644
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -19,8 +19,14 @@ spec:
       labels:
         control-plane: controller-manager
       {{- include "chart.selectorLabels" . | nindent 8 }}
+      {{- with .Values.controllerManager.labels }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       annotations:
         kubectl.kubernetes.io/default-container: manager
+      {{- with .Values.controllerManager.annotations }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       containers:
       - args: {{- toYaml .Values.controllerManager.kubeRbacProxy.args | nindent 8 }}
@@ -64,10 +70,21 @@ spec:
             port: 8081
           initialDelaySeconds: 5
           periodSeconds: 10
+        {{- with .Values.controllerManager.manager.volumeMounts }}
+        volumeMounts:
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         resources: {{- toYaml .Values.controllerManager.manager.resources | nindent 10
           }}
         securityContext: {{- toYaml .Values.controllerManager.manager.containerSecurityContext
           | nindent 10 }}
+    {{- with .Values.controllerManager.extraContainers }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with .Values.controllerManager.volumes }}
+      volumes:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
       securityContext:
         runAsNonRoot: true
       serviceAccountName: {{ include "chart.fullname" . }}-controller-manager
diff --git a/chart/values.yaml b/chart/values.yaml
index ece97a2..8afd82e 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1,4 +1,6 @@
 controllerManager:
+  annotations: {}
+  labels: {}
   serviceMonitor:
     enabled: false
   kubeRbacProxy:
@@ -43,10 +45,13 @@ controllerManager:
       requests:
         cpu: 10m
         memory: 64Mi
+    volumeMounts: []
+  extraContainers: []
+  volumes: []
   replicas: 1
   serviceAccount:
     annotations: {}
-  tolerations: {}
+  tolerations: []
 kubernetesClusterDomain: cluster.local
 metricsService:
   ports: