Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(helm): Add secret annotations #11860

Merged
merged 9 commits into from
Feb 27, 2025
Merged

feat(helm): Add secret annotations #11860

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e7216d2
feat(helm): Add secret annotations
Feb 20, 2025
3e52f5f
Update helm/defectdojo/Chart.yaml
al-cheb Feb 24, 2025
5e4c30f
Update helm/defectdojo/values.yaml
al-cheb Feb 24, 2025
4deab03
Update helm/defectdojo/templates/extra-secret.yaml
al-cheb Feb 24, 2025
95efc09
Update helm/defectdojo/templates/secret-postgresql-ha-pgpool.yaml
al-cheb Feb 24, 2025
ee36f7c
Update helm/defectdojo/templates/secret-postgresql.yaml
al-cheb Feb 24, 2025
cc584f0
Update helm/defectdojo/templates/secret-redis.yaml
al-cheb Feb 24, 2025
6b3a9cf
Update helm/defectdojo/templates/secret-postgresql-ha.yaml
al-cheb Feb 24, 2025
fdf4fd5
Update helm/defectdojo/templates/secret.yaml
al-cheb Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion helm/defectdojo/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
appVersion: "2.44.0-dev"
description: A Helm chart for Kubernetes to install DefectDojo
name: defectdojo
version: 1.6.175-dev
version: 1.6.176-dev
icon: https://www.defectdojo.org/img/favicon.ico
maintainers:
- name: madchap
Expand Down
9 changes: 9 additions & 0 deletions helm/defectdojo/templates/extra-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ metadata:
{{- with .Values.extraLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- if or .Values.secretAnnotations .Values.annotations }}
annotations:
{{- with .Values.secretAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
type: Opaque
data:
{{- range $key, $value := .Values.extraSecrets }}
Expand Down
6 changes: 6 additions & 0 deletions helm/defectdojo/templates/secret-postgresql-ha-pgpool.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ metadata:
helm.sh/resource-policy: keep
helm.sh/hook: "pre-install"
helm.sh/hook-delete-policy: "before-hook-creation"
{{- with .Values.secretAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
type: Opaque
data:
{{- if .Values.postgresqlha.pgpool.adminPassword }}
Expand Down
6 changes: 6 additions & 0 deletions helm/defectdojo/templates/secret-postgresql-ha.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ metadata:
helm.sh/resource-policy: keep
helm.sh/hook: "pre-install"
helm.sh/hook-delete-policy: "before-hook-creation"
{{- with .Values.secretAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
type: Opaque
data:
{{- if .Values.postgresqlha.postgresql.password }}
Expand Down
6 changes: 6 additions & 0 deletions helm/defectdojo/templates/secret-postgresql.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ metadata:
helm.sh/resource-policy: keep
helm.sh/hook: "pre-install"
helm.sh/hook-delete-policy: "before-hook-creation"
{{- with .Values.secretAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
type: Opaque
data:
{{- if .Values.postgresql.auth.password }}
Expand Down
6 changes: 6 additions & 0 deletions helm/defectdojo/templates/secret-redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ metadata:
helm.sh/resource-policy: keep
helm.sh/hook: "pre-install"
helm.sh/hook-delete-policy: "before-hook-creation"
{{- with .Values.secretAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
type: Opaque
data:
{{- if .Values.redis.auth.password }}
Expand Down
6 changes: 6 additions & 0 deletions helm/defectdojo/templates/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ metadata:
helm.sh/resource-policy: keep
helm.sh/hook: "pre-install"
helm.sh/hook-delete-policy: "before-hook-creation"
{{- with .Values.secretAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
type: Opaque
data:
{{- if .Values.admin.password }}
Expand Down
3 changes: 3 additions & 0 deletions helm/defectdojo/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ monitoring:

annotations: {}

# Add annotations for secret resources
secretAnnotations: {}

# Components
celery:
broker: redis
Expand Down