From 9a83e0aa64dac93d6bbd231a1dd4792cb2d03dbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 10:43:01 +0200 Subject: [PATCH] Support extraPodLabels for apiserver and frontend Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/692973e3d937129bcbf40652eb9f2f61becf3332...d632683dd7b4114ad314bca15554477dd762a938) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> support extraPodLabels support extraPodLabels Signed-off-by: Sean Harrington <8240651+initharrington@users.noreply.github.com> support extraPodLabels Signed-off-by: Sean Harrington <8240651+initharrington@users.noreply.github.com> support extraPodlabels remove these --- charts/dependency-track/README.md | 2 ++ .../dependency-track/templates/api-server/deployment.yaml | 3 +++ .../dependency-track/templates/api-server/statefulset.yaml | 3 +++ charts/dependency-track/templates/frontend/deployment.yaml | 3 +++ charts/dependency-track/values.schema.json | 6 ++++++ charts/dependency-track/values.yaml | 2 ++ 6 files changed, 19 insertions(+) diff --git a/charts/dependency-track/README.md b/charts/dependency-track/README.md index 096b0f2..ac98eb6 100644 --- a/charts/dependency-track/README.md +++ b/charts/dependency-track/README.md @@ -30,6 +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 | object | `{}` | | | apiServer.image.pullPolicy | string | `"IfNotPresent"` | | | apiServer.image.registry | string | `""` | Override common.image.registry for the API server. | | apiServer.image.repository | string | `"dependencytrack/apiserver"` | | @@ -83,6 +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 | 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/deployment.yaml b/charts/dependency-track/templates/api-server/deployment.yaml index 9e397c5..af46220 100644 --- a/charts/dependency-track/templates/api-server/deployment.yaml +++ b/charts/dependency-track/templates/api-server/deployment.yaml @@ -13,6 +13,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/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/templates/frontend/deployment.yaml b/charts/dependency-track/templates/frontend/deployment.yaml index 999f793..a6c183c 100644 --- a/charts/dependency-track/templates/frontend/deployment.yaml +++ b/charts/dependency-track/templates/frontend/deployment.yaml @@ -12,6 +12,9 @@ spec: template: metadata: labels: {{- include "dependencytrack.frontendSelectorLabels" . | nindent 8 }} + {{- if .Values.frontend.extraPodLabels }} + {{- toYaml .Values.frontend.extraPodLabels | nindent 8 }} + {{- end }} {{- with .Values.frontend.annotations }} annotations: {{- toYaml . | nindent 8 }} {{- end }} 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 45bc833..4406228 100644 --- a/charts/dependency-track/values.yaml +++ b/charts/dependency-track/values.yaml @@ -70,6 +70,7 @@ apiServer: extraEnvFrom: [] # -- Additional containers to deploy. Supports templating. extraContainers: [] + extraPodLabels: {} tolerations: [] probes: liveness: @@ -161,6 +162,7 @@ frontend: extraEnvFrom: [] # -- Additional containers to deploy. Supports templating. extraContainers: [] + extraPodLabels: {} tolerations: [] probes: liveness: