diff --git a/helm/sealed-secrets/templates/cluster-role-binding.yaml b/helm/sealed-secrets/templates/cluster-role-binding.yaml index 21f0c5d48..a9227b600 100644 --- a/helm/sealed-secrets/templates/cluster-role-binding.yaml +++ b/helm/sealed-secrets/templates/cluster-role-binding.yaml @@ -10,6 +10,10 @@ metadata: {{- if .Values.commonLabels }} {{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "sealed-secrets.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/helm/sealed-secrets/templates/cluster-role.yaml b/helm/sealed-secrets/templates/cluster-role.yaml index 05d837028..5326f3ba9 100644 --- a/helm/sealed-secrets/templates/cluster-role.yaml +++ b/helm/sealed-secrets/templates/cluster-role.yaml @@ -10,6 +10,10 @@ metadata: {{- if .Values.commonLabels }} {{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "sealed-secrets.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} rules: - apiGroups: - bitnami.com diff --git a/helm/sealed-secrets/templates/configmap-dashboards.yaml b/helm/sealed-secrets/templates/configmap-dashboards.yaml index 9cbd2687b..e49974c21 100644 --- a/helm/sealed-secrets/templates/configmap-dashboards.yaml +++ b/helm/sealed-secrets/templates/configmap-dashboards.yaml @@ -18,6 +18,9 @@ metadata: {{- if $.Values.metrics.dashboards.annotations }} {{- include "sealed-secrets.render" ( dict "value" $.Values.metrics.dashboards.annotations "context" $) | nindent 4 }} {{- end }} + {{- if $.Values.commonAnnotations }} + {{- include "sealed-secrets.render" ( dict "value" $.Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} data: {{ base $path }}: |- {{ $.Files.Get $path | indent 4 }} diff --git a/helm/sealed-secrets/templates/deployment.yaml b/helm/sealed-secrets/templates/deployment.yaml index 00728cfb4..7f58646e6 100644 --- a/helm/sealed-secrets/templates/deployment.yaml +++ b/helm/sealed-secrets/templates/deployment.yaml @@ -8,9 +8,10 @@ metadata: {{- if .Values.commonLabels }} {{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} {{- end }} - {{- if .Values.commonAnnotations }} - annotations: {{- toYaml .Values.commonAnnotations | nindent 4 }} - {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "sealed-secrets.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: replicas: 1 {{- if .Values.revisionHistoryLimit }} diff --git a/helm/sealed-secrets/templates/ingress.yaml b/helm/sealed-secrets/templates/ingress.yaml index 39ae89338..85b029e88 100644 --- a/helm/sealed-secrets/templates/ingress.yaml +++ b/helm/sealed-secrets/templates/ingress.yaml @@ -8,12 +8,13 @@ metadata: {{- if .Values.commonLabels }} {{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} {{- end }} - {{- if .Values.ingress.annotations }} annotations: {{- if .Values.ingress.annotations }} {{- include "sealed-secrets.render" ( dict "value" .Values.ingress.annotations "context" $) | nindent 4 }} {{- end }} - {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "sealed-secrets.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: {{- if and .Values.ingress.ingressClassName (eq "true" (include "sealed-secrets.supportsIngressClassname" .)) }} ingressClassName: {{ .Values.ingress.ingressClassName | quote }} diff --git a/helm/sealed-secrets/templates/networkpolicy.yaml b/helm/sealed-secrets/templates/networkpolicy.yaml index 8816f22e7..ca151bf98 100644 --- a/helm/sealed-secrets/templates/networkpolicy.yaml +++ b/helm/sealed-secrets/templates/networkpolicy.yaml @@ -8,6 +8,10 @@ metadata: {{- if .Values.commonLabels }} {{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "sealed-secrets.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: {{- include "sealed-secrets.matchLabels" . | nindent 6 }} diff --git a/helm/sealed-secrets/templates/pdb.yaml b/helm/sealed-secrets/templates/pdb.yaml index e6db12260..a11a8ebe8 100644 --- a/helm/sealed-secrets/templates/pdb.yaml +++ b/helm/sealed-secrets/templates/pdb.yaml @@ -8,9 +8,10 @@ metadata: {{- if .Values.commonLabels }} {{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} {{- end }} - {{- if .Values.commonAnnotations }} - annotations: {{- toYaml .Values.commonAnnotations | nindent 4 }} - {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "sealed-secrets.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: {{- if regexMatch "64$" (typeOf .Values.pdb.minAvailable) }} minAvailable: {{ .Values.pdb.minAvailable }} diff --git a/helm/sealed-secrets/templates/psp-clusterrole.yaml b/helm/sealed-secrets/templates/psp-clusterrole.yaml index aa118d04e..e197f873e 100644 --- a/helm/sealed-secrets/templates/psp-clusterrole.yaml +++ b/helm/sealed-secrets/templates/psp-clusterrole.yaml @@ -10,6 +10,10 @@ metadata: {{- if .Values.commonLabels }} {{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "sealed-secrets.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} rules: - apiGroups: ['extensions'] resources: ['podsecuritypolicies'] diff --git a/helm/sealed-secrets/templates/psp-clusterrolebinding.yaml b/helm/sealed-secrets/templates/psp-clusterrolebinding.yaml index b9430df5a..cf7a2a0d4 100644 --- a/helm/sealed-secrets/templates/psp-clusterrolebinding.yaml +++ b/helm/sealed-secrets/templates/psp-clusterrolebinding.yaml @@ -10,6 +10,10 @@ metadata: {{- if .Values.commonLabels }} {{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "sealed-secrets.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/helm/sealed-secrets/templates/psp.yaml b/helm/sealed-secrets/templates/psp.yaml index 596867159..28822cf38 100644 --- a/helm/sealed-secrets/templates/psp.yaml +++ b/helm/sealed-secrets/templates/psp.yaml @@ -7,6 +7,10 @@ metadata: {{- if .Values.commonLabels }} {{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "sealed-secrets.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: privileged: false allowPrivilegeEscalation: false diff --git a/helm/sealed-secrets/templates/role-binding.yaml b/helm/sealed-secrets/templates/role-binding.yaml index 9458fc29a..e86d2e1a8 100644 --- a/helm/sealed-secrets/templates/role-binding.yaml +++ b/helm/sealed-secrets/templates/role-binding.yaml @@ -11,6 +11,10 @@ metadata: {{- if .Values.commonLabels }} {{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "sealed-secrets.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -35,6 +39,10 @@ metadata: {{- if .Values.commonLabels }} {{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "sealed-secrets.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role @@ -54,6 +62,10 @@ metadata: {{- if $.Values.rbac.labels }} {{- include "sealed-secrets.render" ( dict "value" $.Values.rbac.labels "context" $) | nindent 4 }} {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "sealed-secrets.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/helm/sealed-secrets/templates/role.yaml b/helm/sealed-secrets/templates/role.yaml index 6d4dd1d16..b5d39ef40 100644 --- a/helm/sealed-secrets/templates/role.yaml +++ b/helm/sealed-secrets/templates/role.yaml @@ -11,6 +11,10 @@ metadata: {{- if .Values.commonLabels }} {{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "sealed-secrets.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} rules: - apiGroups: - "" diff --git a/helm/sealed-secrets/templates/servicemonitor.yaml b/helm/sealed-secrets/templates/servicemonitor.yaml index de246bb87..0820724c5 100644 --- a/helm/sealed-secrets/templates/servicemonitor.yaml +++ b/helm/sealed-secrets/templates/servicemonitor.yaml @@ -15,9 +15,13 @@ metadata: {{- if .Values.commonLabels }} {{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} {{- end }} - {{- if .Values.metrics.serviceMonitor.annotations }} - annotations: {{- include "sealed-secrets.render" (dict "value" .Values.metrics.serviceMonitor.annotations "context" $) | nindent 4 }} - {{- end }} + annotations: + {{- if .Values.metrics.serviceMonitor.annotations }} + {{- include "sealed-secrets.render" (dict "value" .Values.metrics.serviceMonitor.annotations "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "sealed-secrets.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} spec: endpoints: - port: metrics diff --git a/helm/sealed-secrets/templates/tls-secret.yaml b/helm/sealed-secrets/templates/tls-secret.yaml index 161cb7cdf..8c2613aae 100644 --- a/helm/sealed-secrets/templates/tls-secret.yaml +++ b/helm/sealed-secrets/templates/tls-secret.yaml @@ -10,6 +10,10 @@ metadata: {{- if .Values.commonLabels }} {{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "sealed-secrets.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} type: kubernetes.io/tls data: tls.crt: {{ .certificate | b64enc }} @@ -29,6 +33,10 @@ metadata: {{- if .Values.commonLabels }} {{- include "sealed-secrets.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }} {{- end }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "sealed-secrets.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} type: kubernetes.io/tls data: tls.crt: {{ $cert.Cert | b64enc | quote }}