feat: serviceAccount and extraContainers to helm chart values (#2766)

* add marquez.serviceAccount and marquez.extraContaiers to helm chart values Signed-off-by: Kostas Theo <ktheo@protonmail.com> * fix typo Signed-off-by: Kostas Theo <ktheo@protonmail.com> --------- Signed-off-by: Kostas Theo <ktheo@protonmail.com> Co-authored-by: Willy Lulciuc <willy@datakin.com>
MarquezProject · Mar 21, 2024 · 13b6fbb · 13b6fbb
1 parent 0e45fe0
commit 13b6fbb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/chart/README.md b/chart/README.md
@@ -47,6 +47,7 @@ helm delete marquez
 
 | Parameter                    | Description                            | Default                  |
 |------------------------------|----------------------------------------|--------------------------|
+| `marquez.serviceAccount`     | K8s service account for Marquez Deploy | `default`                |
 | `marquez.replicaCount`       | Number of desired replicas             | `1`                      |
 | `marquez.image.registry`     | Marquez image registry                 | `docker.io`              |
 | `marquez.image.repository`   | Marquez image repository               | `marquezproject/marquez` |
@@ -65,6 +66,7 @@ helm delete marquez
 | `marquez.resources.limits`   | K8s resource limit overrides           | `nil`                    |
 | `marquez.resources.requests` | K8s resource requests overrides        | `nil`                    |
 | `marquez.podAnnotations`     | Additional pod annotations for Marquez | `{}`                     |
+| `marquez.extraContainers`    | Additional container definitions to include inside Marquez Pod | `[]` |
 
 ### [Marquez Web UI](https://github.com/MarquezProject/marquez-web) **parameters**
 

diff --git a/chart/templates/marquez/deployment.yaml b/chart/templates/marquez/deployment.yaml
@@ -24,6 +24,9 @@ spec:
       labels: {{- include "common.labels.standard" . | nindent 8 }}
         app.kubernetes.io/component: marquez
     spec:
+      {{- if .Values.marquez.serviceAccount }}
+      serviceAccountName: {{ .Values.marquez.serviceAccount }}
+      {{- end }}
       {{- if .Values.postgresql.enabled }}
       # This init container is for avoiding CrashLoopback errors in the Marquez container because the PostgreSQL container is not ready
       initContainers:
@@ -91,6 +94,9 @@ spec:
           {{- if .Values.marquez.resources }}
           resources: {{- toYaml .Values.marquez.resources | nindent 12 }}
           {{- end }}
+        {{- if .Values.marquez.extraContainers }}
+        {{- toYaml .Values.marquez.extraContainers | nindent 8 }}
+        {{- end }}
       volumes:
         - name: marquez-volume
           configMap:

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -8,6 +8,9 @@
 ## Properties related to core Marquez backend functionality and API usage
 ##
 marquez:
+  ## Kubernetes service account used for deployment
+  ##
+  serviceAccount: "default"
   ## Number of desired replicas
   ##
   replicaCount: 1
@@ -59,6 +62,8 @@ marquez:
   ## - name:
   ##   value:
   ##
+  ## Allowing passing in of extra container definitions to be run inside the marquez deployment - for example to allow cloud-sql-proxy container
+  extraContainers: []
 
 ## Properties related to Marquez frontend functionality
 ##