From e9673fd2225c23031062ee5a99686713c2f9249b Mon Sep 17 00:00:00 2001
From: Sean Harrington <8240651+initharrington@users.noreply.github.com>
Date: Tue, 1 Oct 2024 10:50:16 -0400
Subject: [PATCH] support extraPodLabels

support extraPodLabels

Signed-off-by: Sean Harrington <8240651+initharrington@users.noreply.github.com>
---
 charts/dependency-track/README.md                           | 4 ++--
 .../dependency-track/templates/api-server/statefulset.yaml  | 3 +++
 charts/dependency-track/values.schema.json                  | 6 ++++++
 charts/dependency-track/values.yaml                         | 4 ++--
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/charts/dependency-track/README.md b/charts/dependency-track/README.md
index 8856eba..ac98eb6 100644
--- a/charts/dependency-track/README.md
+++ b/charts/dependency-track/README.md
@@ -30,7 +30,7 @@ that allows organizations to identify and reduce risk in the software supply cha
 | apiServer.extraContainers | list | `[]` | Additional containers to deploy. Supports templating. |
 | apiServer.extraEnv | list | `[]` |  |
 | apiServer.extraEnvFrom | list | `[]` |  |
-| apiServer.extraPodLabels | list | `[]` | |
+| apiServer.extraPodLabels | object | `{}` | |
 | apiServer.image.pullPolicy | string | `"IfNotPresent"` |  |
 | apiServer.image.registry | string | `""` | Override common.image.registry for the API server. |
 | apiServer.image.repository | string | `"dependencytrack/apiserver"` |  |
@@ -84,7 +84,7 @@ that allows organizations to identify and reduce risk in the software supply cha
 | frontend.extraContainers | list | `[]` | Additional containers to deploy. Supports templating. |
 | frontend.extraEnv | list | `[]` |  |
 | frontend.extraEnvFrom | list | `[]` |  |
-| frontend.extraPodLabels | list | `[]` | |
+| frontend.extraPodLabels | object | `{}` | |
 | frontend.image.pullPolicy | string | `"IfNotPresent"` |  |
 | frontend.image.registry | string | `""` | Override common.image.registry for the frontend. |
 | frontend.image.repository | string | `"dependencytrack/frontend"` |  |
diff --git a/charts/dependency-track/templates/api-server/statefulset.yaml b/charts/dependency-track/templates/api-server/statefulset.yaml
index ef5ba4d..4b7d71f 100644
--- a/charts/dependency-track/templates/api-server/statefulset.yaml
+++ b/charts/dependency-track/templates/api-server/statefulset.yaml
@@ -14,6 +14,9 @@ spec:
   template:
     metadata:
       labels: {{ include "dependencytrack.apiServerSelectorLabels" . | nindent 8 }}
+      {{- if .Values.apiServer.extraPodLabels }}
+      {{- toYaml .Values.apiServer.extraPodLabels | nindent 8 }}
+      {{- end }}
       annotations:
         prometheus.io/scrape: "true"
         prometheus.io/path: /metrics
diff --git a/charts/dependency-track/values.schema.json b/charts/dependency-track/values.schema.json
index f78a06a..35d6980 100644
--- a/charts/dependency-track/values.schema.json
+++ b/charts/dependency-track/values.schema.json
@@ -109,6 +109,9 @@
         "extraContainers": {
           "$ref": "#/$defs/objectArray"
         },
+        "extraPodLabels": {
+          "type": "object"
+        },
         "tolerations": {
           "$ref": "#/$defs/objectArray"
         },
@@ -174,6 +177,9 @@
         "extraContainers": {
           "$ref": "#/$defs/objectArray"
         },
+        "extraPodLabels": {
+          "type": "object"
+        },
         "tolerations": {
           "$ref": "#/$defs/objectArray"
         },
diff --git a/charts/dependency-track/values.yaml b/charts/dependency-track/values.yaml
index 5bcd757..4406228 100644
--- a/charts/dependency-track/values.yaml
+++ b/charts/dependency-track/values.yaml
@@ -70,7 +70,7 @@ apiServer:
   extraEnvFrom: []
   # -- Additional containers to deploy. Supports templating.
   extraContainers: []
-  extraPodLabels: []
+  extraPodLabels: {}
   tolerations: []
   probes:
     liveness:
@@ -162,7 +162,7 @@ frontend:
   extraEnvFrom: []
   # -- Additional containers to deploy. Supports templating.
   extraContainers: []
-  extraPodLabels: []
+  extraPodLabels: {}
   tolerations: []
   probes:
     liveness: