Skip to content

Commit 0ad1445

Browse files
JGodin-C2CJGodin-C2C
committed
feat: add the extra labels capabilities for chart
Signed-off-by: Julien Godin <julien.godin@camptocamp.com>
1 parent e24aa1b commit 0ad1445

16 files changed

+64
-1
lines changed

‎helm/defectdojo/templates/celery-beat-deployment.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ metadata:
1010
app.kubernetes.io/instance: {{ .Release.Name }}
1111
app.kubernetes.io/managed-by: {{ .Release.Service }}
1212
helm.sh/chart: {{ include "defectdojo.chart" . }}
13+
{{- if .Values.extraLabels }}
14+
{{ .Values.extraLabels | toYaml | trim | indent 4 }}
15+
{{- end -}}
1316
spec:
1417
replicas: {{ .Values.celery.beat.replicas }}
1518
{{- if .Values.revisionHistoryLimit }}
@@ -28,6 +31,9 @@ spec:
2831
defectdojo.org/subcomponent: beat
2932
app.kubernetes.io/name: {{ include "defectdojo.name" . }}
3033
app.kubernetes.io/instance: {{ .Release.Name }}
34+
{{- if .Values.extraLabels }}
35+
{{ .Values.extraLabels | toYaml | trim | indent 8 }}
36+
{{- end -}}
3137
{{- if .Values.podLabels }}
3238
{{- toYaml .Values.podLabels | nindent 8 }}
3339
{{- end }}

‎helm/defectdojo/templates/celery-worker-deployment.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ metadata:
1010
app.kubernetes.io/instance: {{ .Release.Name }}
1111
app.kubernetes.io/managed-by: {{ .Release.Service }}
1212
helm.sh/chart: {{ include "defectdojo.chart" . }}
13+
{{- if .Values.extraLabels }}
14+
{{ .Values.extraLabels | toYaml | trim | indent 4 }}
15+
{{- end -}}
1316
spec:
1417
replicas: {{ .Values.celery.worker.replicas }}
1518
{{- if .Values.revisionHistoryLimit }}
@@ -28,6 +31,9 @@ spec:
2831
defectdojo.org/subcomponent: worker
2932
app.kubernetes.io/name: {{ include "defectdojo.name" . }}
3033
app.kubernetes.io/instance: {{ .Release.Name }}
34+
{{- if .Values.extraLabels }}
35+
{{ .Values.extraLabels | toYaml | trim | indent 8 }}
36+
{{- end -}}
3137
{{- if .Values.podLabels }}
3238
{{- toYaml .Values.podLabels | nindent 8 }}
3339
{{- end }}

‎helm/defectdojo/templates/configmap.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ metadata:
88
app.kubernetes.io/instance: {{ .Release.Name }}
99
app.kubernetes.io/managed-by: {{ .Release.Service }}
1010
helm.sh/chart: {{ include "defectdojo.chart" . }}
11+
{{- if .Values.extraLabels }}
12+
{{ .Values.extraLabels | toYaml | trim | indent 4 }}
13+
{{- end -}}
1114
data:
1215
DD_ADMIN_USER: {{ .Values.admin.user | default "admin" }}
1316
DD_ADMIN_MAIL: {{ .Values.admin.Mail | default "admin@defectdojo.local" }}

‎helm/defectdojo/templates/django-deployment.yaml

+7-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ metadata:
99
app.kubernetes.io/instance: {{ .Release.Name }}
1010
app.kubernetes.io/managed-by: {{ .Release.Service }}
1111
helm.sh/chart: {{ include "defectdojo.chart" . }}
12+
{{- if .Values.extraLabels }}
13+
{{ .Values.extraLabels | toYaml | trim | indent 4 }}
14+
{{- end -}}
1215
spec:
1316
replicas: {{ .Values.django.replicas }}
1417
{{- if .Values.revisionHistoryLimit }}
@@ -25,9 +28,12 @@ spec:
2528
defectdojo.org/component: django
2629
app.kubernetes.io/name: {{ include "defectdojo.name" . }}
2730
app.kubernetes.io/instance: {{ .Release.Name }}
31+
{{- if .Values.extraLabels }}
32+
{{ .Values.extraLabels | toYaml | trim | indent 8 }}
33+
{{- end -}}
2834
{{- if .Values.podLabels }}
2935
{{- toYaml .Values.podLabels | nindent 8 }}
30-
{{- end }}
36+
{{- end }}
3137
annotations:
3238
{{- with .Values.django.annotations }}
3339
{{- toYaml . | nindent 8 }}

‎helm/defectdojo/templates/django-ingress.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ metadata:
1414
app.kubernetes.io/instance: {{ .Release.Name }}
1515
app.kubernetes.io/managed-by: {{ .Release.Service }}
1616
helm.sh/chart: {{ include "defectdojo.chart" . }}
17+
{{- if .Values.extraLabels }}
18+
{{ .Values.extraLabels | toYaml | trim | indent 4 }}
19+
{{- end -}}
1720
{{- if or .Values.django.ingress.annotations .Values.gke.useGKEIngress }}
1821
annotations:
1922
{{- with .Values.django.ingress.annotations }}

‎helm/defectdojo/templates/django-service.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ metadata:
99
app.kubernetes.io/instance: {{ .Release.Name }}
1010
app.kubernetes.io/managed-by: {{ .Release.Service }}
1111
helm.sh/chart: {{ include "defectdojo.chart" . }}
12+
{{- if .Values.extraLabels }}
13+
{{ .Values.extraLabels | toYaml | trim | indent 4 }}
14+
{{- end -}}
1215
{{- if .Values.django.service.annotations }}
1316
annotations:
1417
{{- range $key, $value := .Values.django.service.annotations }}

‎helm/defectdojo/templates/initializer-job.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ metadata:
1010
app.kubernetes.io/instance: {{ .Release.Name }}
1111
app.kubernetes.io/managed-by: {{ .Release.Service }}
1212
helm.sh/chart: {{ include "defectdojo.chart" . }}
13+
{{- if .Values.extraLabels }}
14+
{{ .Values.extraLabels | toYaml | trim | indent 4 }}
15+
{{- end -}}
1316
annotations:
1417
{{- with .Values.initializer.jobAnnotations }}
1518
{{- toYaml . | nindent 4 }}
@@ -22,6 +25,9 @@ spec:
2225
defectdojo.org/component: initializer
2326
app.kubernetes.io/name: {{ include "defectdojo.name" . }}
2427
app.kubernetes.io/instance: {{ .Release.Name }}
28+
{{- if .Values.extraLabels }}
29+
{{ .Values.extraLabels | toYaml | trim | indent 8 }}
30+
{{- end -}}
2531
{{- if .Values.initializer.labels }}
2632
{{- toYaml .Values.initializer.labels | nindent 8 }}
2733
{{- end }}

‎helm/defectdojo/templates/media-pvc.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ metadata:
1010
app.kubernetes.io/instance: {{ $.Release.Name }}
1111
app.kubernetes.io/managed-by: {{ $.Release.Service }}
1212
helm.sh/chart: {{ include "defectdojo.chart" $ }}
13+
{{- if .Values.extraLabels }}
14+
{{ .Values.extraLabels | toYaml | trim | indent 4 }}
15+
{{- end -}}
1316
name: {{ $fullName }}
1417
spec:
1518
accessModes:

‎helm/defectdojo/templates/network-policy.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ metadata:
99
app.kubernetes.io/managed-by: {{ .Release.Service }}
1010
helm.sh/chart: {{ include "defectdojo.chart" . }}
1111
app.kubernetes.io/name: {{ include "defectdojo.name" . }}
12+
{{- if .Values.extraLabels }}
13+
{{ .Values.extraLabels | toYaml | trim | indent 4 }}
14+
{{- end -}}
1215
spec:
1316
podSelector:
1417
matchLabels:
@@ -40,6 +43,9 @@ metadata:
4043
app.kubernetes.io/managed-by: {{ .Release.Service }}
4144
helm.sh/chart: {{ include "defectdojo.chart" . }}
4245
app.kubernetes.io/name: {{ include "defectdojo.name" . }}
46+
{{- if .Values.extraLabels }}
47+
{{ .Values.extraLabels | toYaml | trim | indent 4 }}
48+
{{- end -}}
4349
spec:
4450
podSelector:
4551
matchLabels:

‎helm/defectdojo/templates/sa.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ metadata:
88
app.kubernetes.io/instance: {{ .Release.Name }}
99
app.kubernetes.io/managed-by: {{ .Release.Service }}
1010
helm.sh/chart: {{ include "defectdojo.chart" . }}
11+
{{- if .Values.extraLabels }}
12+
{{ .Values.extraLabels | toYaml | trim | indent 4 }}
13+
{{- end -}}
1114
annotations:
1215
helm.sh/resource-policy: keep
1316
helm.sh/hook: "pre-install"

‎helm/defectdojo/templates/secret-postgresql-ha-pgpool.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ metadata:
88
app.kubernetes.io/instance: {{ .Release.Name }}
99
app.kubernetes.io/managed-by: {{ .Release.Service }}
1010
helm.sh/chart: {{ include "defectdojo.chart" . }}
11+
{{- if .Values.extraLabels }}
12+
{{ .Values.extraLabels | toYaml | trim | indent 4 }}
13+
{{- end -}}
1114
annotations:
1215
helm.sh/resource-policy: keep
1316
helm.sh/hook: "pre-install"

‎helm/defectdojo/templates/secret-postgresql-ha.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ metadata:
88
app.kubernetes.io/instance: {{ .Release.Name }}
99
app.kubernetes.io/managed-by: {{ .Release.Service }}
1010
helm.sh/chart: {{ include "defectdojo.chart" . }}
11+
{{- if .Values.extraLabels }}
12+
{{ .Values.extraLabels | toYaml | trim | indent 4 }}
13+
{{- end -}}
1114
annotations:
1215
helm.sh/resource-policy: keep
1316
helm.sh/hook: "pre-install"

‎helm/defectdojo/templates/secret-postgresql.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ metadata:
88
app.kubernetes.io/instance: {{ .Release.Name }}
99
app.kubernetes.io/managed-by: {{ .Release.Service }}
1010
helm.sh/chart: {{ include "defectdojo.chart" . }}
11+
{{- if .Values.extraLabels }}
12+
{{ .Values.extraLabels | toYaml | trim | indent 4 }}
13+
{{- end -}}
1114
annotations:
1215
helm.sh/resource-policy: keep
1316
helm.sh/hook: "pre-install"

‎helm/defectdojo/templates/secret-redis.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ metadata:
88
app.kubernetes.io/instance: {{ .Release.Name }}
99
app.kubernetes.io/managed-by: {{ .Release.Service }}
1010
helm.sh/chart: {{ include "defectdojo.chart" . }}
11+
{{- if .Values.extraLabels }}
12+
{{ .Values.extraLabels | toYaml | trim | indent 4 }}
13+
{{- end -}}
1114
annotations:
1215
helm.sh/resource-policy: keep
1316
helm.sh/hook: "pre-install"

‎helm/defectdojo/templates/secret.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ metadata:
99
app.kubernetes.io/instance: {{ .Release.Name }}
1010
app.kubernetes.io/managed-by: {{ .Release.Service }}
1111
helm.sh/chart: {{ include "defectdojo.chart" . }}
12+
{{- if .Values.extraLabels }}
13+
{{ .Values.extraLabels | toYaml | trim | indent 4 }}
14+
{{- end -}}
1215
annotations:
1316
helm.sh/resource-policy: keep
1417
helm.sh/hook: "pre-install"

‎helm/defectdojo/values.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ createPostgresqlHaPgpoolSecret: false
1616
# - enabled, enables tracking configuration changes based on SHA256
1717
# trackConfig: disabled
1818

19+
# extraLabels: {}
20+
# Add extra labels for k8s
21+
1922
# Enables application network policy
2023
# For more info follow https://kubernetes.io/docs/concepts/services-networking/network-policies/
2124
networkPolicy:

0 commit comments

Comments
 (0)