From 7f36a74130da0fca46b9ad86f8acf9e1419e70b5 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Fri, 12 Apr 2024 10:27:35 +0100 Subject: [PATCH] Allow specifying sidecars for the pods in our Helm chart. --- .../templates/app-service-deployment.yaml | 3 +++ .../automation-worker-service-deployment.yaml | 3 +++ .../templates/minio-service-deployment.yaml | 3 +++ .../templates/proxy-service-deployment.yaml | 4 +++- .../templates/redis-service-deployment.yaml | 3 +++ .../templates/worker-service-deployment.yaml | 3 +++ charts/budibase/values.yaml | 24 +++++++++++++++++++ 7 files changed, 42 insertions(+), 1 deletion(-) diff --git a/charts/budibase/templates/app-service-deployment.yaml b/charts/budibase/templates/app-service-deployment.yaml index c7c4481122..2fd8506e30 100644 --- a/charts/budibase/templates/app-service-deployment.yaml +++ b/charts/budibase/templates/app-service-deployment.yaml @@ -235,6 +235,9 @@ spec: args: {{- toYaml .Values.services.apps.args | nindent 10 }} {{ end }} + {{- if .Values.services.apps.extraContainers }} + {{- toYaml .Values.services.apps.extraContainers | nindent 6 }} + {{- end }} {{- with .Values.affinity }} affinity: {{- toYaml . | nindent 8 }} diff --git a/charts/budibase/templates/automation-worker-service-deployment.yaml b/charts/budibase/templates/automation-worker-service-deployment.yaml index 36c3a8ffbf..53d5fcc860 100644 --- a/charts/budibase/templates/automation-worker-service-deployment.yaml +++ b/charts/budibase/templates/automation-worker-service-deployment.yaml @@ -235,6 +235,9 @@ spec: args: {{- toYaml .Values.services.automationWorkers.args | nindent 10 }} {{ end }} + {{- if .Values.services.automationWorkers.extraContainers }} + {{- toYaml .Values.services.automationWorkers.extraContainers | nindent 6 }} + {{- end }} {{- with .Values.affinity }} affinity: {{- toYaml . | nindent 8 }} diff --git a/charts/budibase/templates/minio-service-deployment.yaml b/charts/budibase/templates/minio-service-deployment.yaml index 28e8eb9991..ade1d37cd2 100644 --- a/charts/budibase/templates/minio-service-deployment.yaml +++ b/charts/budibase/templates/minio-service-deployment.yaml @@ -54,6 +54,9 @@ spec: volumeMounts: - mountPath: /data name: minio-data + {{- if .Values.services.objectStore.extraContainers }} + {{- toYaml .Values.services.objectStore.extraContainers | nindent 6 }} + {{- end }} {{- with .Values.affinity }} affinity: {{- toYaml . | nindent 8 }} diff --git a/charts/budibase/templates/proxy-service-deployment.yaml b/charts/budibase/templates/proxy-service-deployment.yaml index 233028cafe..462c6a0749 100644 --- a/charts/budibase/templates/proxy-service-deployment.yaml +++ b/charts/budibase/templates/proxy-service-deployment.yaml @@ -82,7 +82,9 @@ spec: resources: {{- toYaml . | nindent 10 }} {{ end }} - volumeMounts: + {{- if .Values.services.proxy.extraContainers }} + {{- toYaml .Values.services.proxy.extraContainers | nindent 6 }} + {{- end }} {{- with .Values.affinity }} affinity: {{- toYaml . | nindent 8 }} diff --git a/charts/budibase/templates/redis-service-deployment.yaml b/charts/budibase/templates/redis-service-deployment.yaml index bca40d2237..1a003d3814 100644 --- a/charts/budibase/templates/redis-service-deployment.yaml +++ b/charts/budibase/templates/redis-service-deployment.yaml @@ -34,6 +34,9 @@ spec: volumeMounts: - mountPath: /data name: redis-data + {{- if .Values.services.redis.extraContainers }} + {{- toYaml .Values.services.redis.extraContainers | nindent 6 }} + {{- end }} {{- with .Values.affinity }} affinity: {{- toYaml . | nindent 8 }} diff --git a/charts/budibase/templates/worker-service-deployment.yaml b/charts/budibase/templates/worker-service-deployment.yaml index 2f97508ae3..cc27bf429e 100644 --- a/charts/budibase/templates/worker-service-deployment.yaml +++ b/charts/budibase/templates/worker-service-deployment.yaml @@ -221,6 +221,9 @@ spec: args: {{- toYaml .Values.services.worker.args | nindent 10 }} {{ end }} + {{- if .Values.services.worker.extraContainers }} + {{- toYaml .Values.services.worker.extraContainers | nindent 6 }} + {{- end }} {{- with .Values.affinity }} affinity: {{- toYaml . | nindent 8 }} diff --git a/charts/budibase/values.yaml b/charts/budibase/values.yaml index 19b6c22d6c..d368c0ff38 100644 --- a/charts/budibase/values.yaml +++ b/charts/budibase/values.yaml @@ -206,6 +206,10 @@ services: # for autoscaling to work, you will need to have metrics-server # configured, and resources set for the proxy pods. targetCPUUtilizationPercentage: 80 + # -- Additional containers to be added to the proxy pod. + extraContainers: [] + # - name: my-sidecar + # image: myimage:latest apps: # @ignore (you shouldn't need to change this) @@ -274,6 +278,10 @@ services: # autoscaling to work, you will need to have metrics-server configured, # and resources set for the apps pods. targetCPUUtilizationPercentage: 80 + # -- Additional containers to be added to the apps pod. + extraContainers: [] + # - name: my-sidecar + # image: myimage:latest automationWorkers: # -- Whether or not to enable the automation worker service. If you disable this, @@ -346,6 +354,10 @@ services: # Note that for autoscaling to work, you will need to have metrics-server # configured, and resources set for the automation worker pods. targetCPUUtilizationPercentage: 80 + # -- Additional containers to be added to the automationWorkers pod. + extraContainers: [] + # - name: my-sidecar + # image: myimage:latest worker: # @ignore (you shouldn't need to change this) @@ -414,6 +426,10 @@ services: # for autoscaling to work, you will need to have metrics-server # configured, and resources set for the worker pods. targetCPUUtilizationPercentage: 80 + # -- Additional containers to be added to the worker pod. + extraContainers: [] + # - name: my-sidecar + # image: myimage:latest couchdb: # -- Whether or not to spin up a CouchDB instance in your cluster. True by @@ -463,6 +479,10 @@ services: # # for more information on how to set these. resources: {} + # -- Additional containers to be added to the redis pod. + extraContainers: [] + # - name: my-sidecar + # image: myimage:latest objectStore: # -- Set to false if using another object store, such as S3. You will need @@ -505,6 +525,10 @@ services: publicKeyId: "" # -- Base64 encoded private key for the above public key. privateKey64: "" + # -- Additional containers to be added to the objectStore pod. + extraContainers: [] + # - name: my-sidecar + # image: myimage:latest # Override values in couchDB subchart. We're only specifying the values we're changing. # If you want to see all of the available values, see: