diff --git a/charts/generic/Chart.yaml b/charts/generic/Chart.yaml index 1444d4e..ba7f2e1 100644 --- a/charts/generic/Chart.yaml +++ b/charts/generic/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v2 name: generic description: Generic Chart -version: 1.0.1 +version: 1.1.0 diff --git a/charts/generic/templates/configMaps.yaml b/charts/generic/templates/configMaps.yaml index e25d251..0a67e10 100644 --- a/charts/generic/templates/configMaps.yaml +++ b/charts/generic/templates/configMaps.yaml @@ -11,6 +11,9 @@ metadata: name: "{{ $fullName }}-{{ .name | default "default" }}" {{- end }} labels: {{ $labels | nindent 4 }} + {{- with .annotations }} + annotations: {{ toYaml . | nindent 4 }} + {{- end }} data: {{- range $key, $value := .data }} {{ $key }}: {{ $value }} diff --git a/charts/generic/templates/cronjobs.yaml b/charts/generic/templates/cronjobs.yaml index fd2960a..6478930 100644 --- a/charts/generic/templates/cronjobs.yaml +++ b/charts/generic/templates/cronjobs.yaml @@ -11,6 +11,9 @@ metadata: name: "{{ $fullName }}-{{ $cronjob.name | default $cronjobName }}" {{- end }} labels: {{ include "generic.labels" $ | nindent 4 }} + {{- with .annotations }} + annotations: {{ toYaml . | nindent 4 }} + {{- end }} spec: {{- with $cronjob.concurrencyPolicy }} concurrencyPolicy: {{ . }} diff --git a/charts/generic/templates/deployment.yaml b/charts/generic/templates/deployment.yaml index 644c396..e902f25 100644 --- a/charts/generic/templates/deployment.yaml +++ b/charts/generic/templates/deployment.yaml @@ -4,6 +4,9 @@ kind: Deployment metadata: name: {{ $fullName }} labels: {{ include "generic.labels" . | nindent 4 }} + {{- with .annotations }} + annotations: {{ toYaml . | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicaCount }} selector: diff --git a/charts/generic/templates/hpa.yaml b/charts/generic/templates/hpa.yaml index e5cd3b4..3248532 100644 --- a/charts/generic/templates/hpa.yaml +++ b/charts/generic/templates/hpa.yaml @@ -4,6 +4,9 @@ kind: HorizontalPodAutoscaler metadata: name: {{ include "generic.fullname" . }} labels: {{ include "generic.labels" . | nindent 4 }} + {{- with .annotations }} + annotations: {{ toYaml . | nindent 4 }} + {{- end }} spec: scaleTargetRef: apiVersion: apps/v1 diff --git a/charts/generic/templates/jobs.yaml b/charts/generic/templates/jobs.yaml index 2a89742..54a0020 100644 --- a/charts/generic/templates/jobs.yaml +++ b/charts/generic/templates/jobs.yaml @@ -12,6 +12,9 @@ metadata: {{- end }} labels: {{ include "generic.labels" $ | nindent 4 }} annotations: + {{- with .annotations }} + {{ toYaml . | indent 4 }} + {{- end }} {{- with $job.hook }} "helm.sh/hook": {{ . }} {{- end }} diff --git a/charts/generic/templates/pvcs.yaml b/charts/generic/templates/pvcs.yaml index 640d809..ba98382 100644 --- a/charts/generic/templates/pvcs.yaml +++ b/charts/generic/templates/pvcs.yaml @@ -11,6 +11,9 @@ metadata: name: "{{ $fullName }}-{{ .name | default "default" }}" {{- end }} labels: {{ $labels | nindent 4 }} + {{- with .annotations }} + annotations: {{ toYaml . | nindent 4 }} + {{- end }} spec: {{- if .className }} storageClassName: {{ .className }} diff --git a/charts/generic/templates/secrets.yaml b/charts/generic/templates/secrets.yaml index 7aa8d14..74c2b24 100644 --- a/charts/generic/templates/secrets.yaml +++ b/charts/generic/templates/secrets.yaml @@ -11,6 +11,9 @@ metadata: name: "{{ $fullName }}-{{ .name | default "default" }}" {{- end }} labels: {{ $labels | nindent 4 }} + {{- with .annotations }} + annotations: {{ toYaml . | nindent 4 }} + {{- end }} type: Opaque data: {{- range $key, $value := $secret.data }} diff --git a/charts/generic/templates/services.yaml b/charts/generic/templates/services.yaml index 4f3f914..cb7d426 100644 --- a/charts/generic/templates/services.yaml +++ b/charts/generic/templates/services.yaml @@ -12,6 +12,9 @@ metadata: name: "{{ $fullName }}-{{ $serviceName | default "default" }}" {{- end }} labels: {{ $labels | nindent 4 }} + {{- with .annotations }} + annotations: {{ toYaml . | nindent 4 }} + {{- end }} spec: type: {{ $service.type }} ports: