Allow annotation of all objects created by the eks,8s and k0s charts

charts/eks/templates/api-deployment.yaml

@@ -12,9 +12,10 @@ metadata:
 {{- if .Values.api.labels }}
 {{ toYaml .Values.api.labels | indent 4 }}
 {{- end }}
-  {{- if .Values.api.annotations }}
+  {{- $annotations := merge .Values.globalAnnotations .Values.api.annotations }}
+  {{- if $annotations }}
   annotations:
-{{ toYaml .Values.api.annotations | indent 4 }}
+{{ toYaml $annotations | indent 4 }}
   {{- end }}
 spec:
   replicas: {{ .Values.api.replicas }}

charts/eks/templates/controller-deployment.yaml

@@ -12,9 +12,10 @@ metadata:
 {{- if .Values.controller.labels }}
 {{ toYaml .Values.controller.labels | indent 4 }}
 {{- end }}
-  {{- if .Values.controller.annotations }}
+  {{- $annotations := merge .Values.globalAnnotations .Values.controller.annotations }}
+  {{- if $annotations }}
   annotations:
-{{ toYaml .Values.controller.annotations | indent 4 }}
+{{ toYaml $annotations | indent 4 }}
   {{- end }}
 spec:
   replicas: {{ .Values.controller.replicas }}

charts/eks/templates/coredns.yaml

@@ -3,6 +3,10 @@ kind: ConfigMap
 metadata:
   name: custom-deployments
   namespace: {{ .Release.Namespace }}
+  {{- if .Values.globalAnnotations}}
+  annotations:
+{{ toYaml .Values.globalAnnotations | indent 4}}
+  {{- end}}  
 data:
 {{- if .Values.coredns.manifests }}
   coredns.yaml: |-

charts/eks/templates/daemonset-hostpath-mapper.yaml

@@ -17,9 +17,10 @@ metadata:
 {{- if .Values.labels }}
 {{ toYaml .Values.labels | indent 4 }}
 {{- end }}
-  {{- if .Values.annotations }}
+  {{- $annotations := merge .Values.globalAnnotations .Values.annotations }}
+  {{- if $annotations }}
   annotations:
-{{ toYaml .Values.annotations | indent 4 }}
+{{ toYaml $annotations | indent 4 }}
   {{- end }}
 spec:
   {{- if .Values.hostpathMapper.dev }}

charts/eks/templates/etcd-statefulset.yaml

@@ -12,9 +12,10 @@ metadata:
 {{- if .Values.etcd.labels }}
 {{ toYaml .Values.etcd.labels | indent 4 }}
 {{- end }}
-  {{- if .Values.etcd.annotations }}
+  {{- $annotations := merge .Values.globalAnnotations .Values.etcd.annotations }}
+  {{- if $annotations }}
   annotations:
-{{ toYaml .Values.etcd.annotations | indent 4 }}
+{{ toYaml $annotations | indent 4 }}
   {{- end }}
 spec:
   serviceName: {{ .Release.Name }}-etcd-headless

charts/eks/templates/ingress.yaml

@@ -2,9 +2,10 @@
 apiVersion: {{ .Values.ingress.apiVersion }}
 kind: Ingress
 metadata:
-  {{- if .Values.ingress.annotations }}
+{{- $annotations := merge .Values.ingress.annotations .Values.globalAnnotations  }}  
+  {{- if $annotations }}
   annotations:
-  {{- toYaml .Values.ingress.annotations | nindent 4 }}
+  {{- toYaml $annotations | nindent 4 }}
   {{- end }}
   name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}

charts/eks/templates/init-configmap.yaml

@@ -9,6 +9,10 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  {{- if .Values.globalAnnotations}}
+  annotations:
+{{ toYaml .Values.globalAnnotations | indent 4 }}    
+  {{- end }}
 data:
   manifests: |-
     {{ .Values.init.manifests | nindent 4 | trim }}

charts/eks/templates/limitrange.yaml

@@ -4,6 +4,10 @@ kind: LimitRange
 metadata:
   name: {{ .Release.Name }}-limit-range
   namespace: {{ .Values.isolation.namespace | default .Release.Namespace }}
+  {{- if .Values.globalAnnotations }}
+  annotations:
+{{ toYaml .Values.globalAnnotations | indent 4 }}
+  {{- end }}
 spec:
   limits:
   - default:

charts/eks/templates/networkpolicy.yaml

@@ -4,6 +4,10 @@ kind: NetworkPolicy
 metadata:
   name: {{ .Release.Name }}-workloads
   namespace: {{ .Values.isolation.namespace | default .Release.Namespace }}
+  {{- if .Values.globalAnnotations }}
+  annotations:
+{{ toYaml .Values.globalAnnotations | indent 4 }}
+  {{- end }}
 spec:
   podSelector:
     matchLabels:
@@ -43,6 +47,10 @@ kind: NetworkPolicy
 metadata:
   name: {{ .Release.Name }}-control-plane
   namespace: {{ .Release.Namespace }}
+  {{- if .Values.globalAnnotations }}
+  annotations:
+{{ toYaml .Values.globalAnnotations | indent 4 }}
+  {{- end }}
 spec:
   podSelector:
     matchLabels:

charts/eks/templates/pre-install-hook-job-role.yaml

@@ -5,9 +5,12 @@ metadata:
   name: {{ .Release.Name }}-job
   namespace: {{ .Release.Namespace }}
   annotations:
+  {{- if .Values.globalAnnotations }}
+{{ toYaml .Values.globalAnnotations | indent 4 }}
+  {{- end }}    
     "helm.sh/hook": pre-install
     "helm.sh/hook-weight": "3"
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded    
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 rules:
   - apiGroups: [""]
     resources: ["secrets", "configmaps","services"]

charts/eks/templates/pre-install-hook-job-rolebinding.yaml

@@ -5,6 +5,9 @@ metadata:
   name: {{ .Release.Name }}-job
   namespace: {{ .Release.Namespace }}
   annotations:
+  {{- if .Values.globalAnnotations}}
+{{ toYaml .Values.globalAnnotations | indent 4 }}
+  {{- end }}
     "helm.sh/hook": pre-install
     "helm.sh/hook-weight": "3"
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded

charts/eks/templates/pre-install-hook-job-serviceaccount.yaml

@@ -5,6 +5,9 @@ metadata:
   name: {{ .Release.Name }}-job
   namespace: {{ .Release.Namespace }}
   annotations:
+  {{- if .Values.globalAnnotations}}
+{{ toYaml .Values.globalAnnotations | indent 4 }}
+  {{- end }}
     "helm.sh/hook": pre-install
     "helm.sh/hook-weight": "3"
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded

charts/eks/templates/pre-install-hook-job.yaml

@@ -5,6 +5,9 @@ metadata:
   name: {{ .Release.Name }}-job
   namespace: {{ .Release.Namespace }}
   annotations:
+  {{- if .Values.globalAnnotations}}
+{{ toYaml .Values.globalAnnotations | indent 4 }}
+  {{- end }}
     "helm.sh/hook": pre-install
     "helm.sh/hook-weight": "3"
     "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded

charts/eks/templates/resourcequota.yaml

@@ -4,6 +4,10 @@ kind: ResourceQuota
 metadata:
   name:  {{ .Release.Name }}-quota
   namespace: {{ .Values.isolation.namespace | default .Release.Namespace }}
+  {{- if .Values.globalAnnotations }}
+  annotations:
+{{ toYaml .Values.globalAnnotations | indent 4 }}
+  {{- end }}
 spec:
   hard:
     {{- range $key, $val := .Values.isolation.resourceQuota.quota }}

charts/eks/templates/serviceaccount.yaml

@@ -9,6 +9,10 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  {{- if .Values.globalAnnotations }}
+  annotations:
+{{ toYaml .Values.globalAnnotations | indent 4 }}
+  {{- end }}
 {{- if .Values.serviceAccount.imagePullSecrets }}
 imagePullSecrets:
 {{ toYaml .Values.serviceAccount.imagePullSecrets | indent 2 }}

charts/eks/templates/syncer-deployment.yaml

@@ -11,9 +11,10 @@ metadata:
 {{- if .Values.syncer.labels }}
 {{ toYaml .Values.syncer.labels | indent 4 }}
 {{- end }}
-  {{- if .Values.syncer.annotations }}
+  {{- $annotations := merge .Values.globalAnnotations .Values.syncer.annotations }}
+  {{- if $annotations }}
   annotations:
-{{ toYaml .Values.syncer.annotations | indent 4 }}
+{{ toYaml $annotations | indent 4 }}
   {{- end }}
 spec:
   replicas: {{ .Values.syncer.replicas }}

charts/eks/templates/workloadserviceaccount.yaml

@@ -8,6 +8,10 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  {{- if .Values.globalAnnotations }}
+  annotations:
+{{ toYaml .Values.globalAnnotations | indent 4 }}
+  {{- end }}
 {{- if .Values.serviceAccount.imagePullSecrets }}
 imagePullSecrets:
 {{ toYaml .Values.serviceAccount.imagePullSecrets | indent 2 }}

charts/k0s/templates/coredns.yaml

@@ -4,6 +4,10 @@ kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-coredns
   namespace: {{ .Release.Namespace }}
+  {{- if .Values.globalAnnotations }}
+  annotations:
+{{ toYaml .Values.globalAnnotations | indent 4 }}
+  {{- end }}
 data:
 {{- if .Values.coredns.manifests }}
   coredns.yaml: |-

charts/k0s/templates/daemonset-hostpath-mapper.yaml

@@ -17,9 +17,10 @@ metadata:
 {{- if .Values.labels }}
 {{ toYaml .Values.labels | indent 4 }}
 {{- end }}
-  {{- if .Values.annotations }}
+  {{- $annotations := merge .Values.globalAnnotations .Values.annotations }}
+  {{- if $annotations }}
   annotations:
-{{ toYaml .Values.annotations | indent 4 }}
+{{ toYaml $annotations | indent 4 }}
   {{- end }}
 spec:
   {{- if .Values.hostpathMapper.dev }}

charts/k0s/templates/ingress.yaml

@@ -2,9 +2,10 @@
 apiVersion: {{ .Values.ingress.apiVersion }}
 kind: Ingress
 metadata:
-  {{- if .Values.ingress.annotations }}
+  {{- $annotations := merge .Values.ingress.annotations .Values.globalAnnotations }}
+  {{- if $annotations }}
   annotations:
-  {{- toYaml .Values.ingress.annotations | nindent 4 }}
+  {{- toYaml $annotations | nindent 4 }}
   {{- end }}
   name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}

charts/k0s/templates/init-configmap.yaml

@@ -9,6 +9,10 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  {{- if .Values.globalAnnotations }}
+  annotations:
+{{ toYaml .Values.globalAnnotations | indent 4 }}
+  {{- end }}
 data:
   manifests: |-
     {{ .Values.init.manifests | nindent 4 | trim }}

charts/k0s/templates/limitrange.yaml

@@ -4,6 +4,10 @@ kind: LimitRange
 metadata:
   name: {{ .Release.Name }}-limit-range
   namespace: {{ .Values.isolation.namespace | default .Release.Namespace }}
+  {{- if .Values.globalAnnotations }}
+  annotations:
+{{ toYaml .Values.globalAnnotations | indent 4 }}
+  {{- end }}
 spec:
   limits:
   - default:

charts/k0s/templates/resourcequota.yaml

@@ -4,6 +4,10 @@ kind: ResourceQuota
 metadata:
   name:  {{ .Release.Name }}-quota
   namespace: {{ .Values.isolation.namespace | default .Release.Namespace }}
+  {{- if .Values.globalAnnotations }}
+  annotations:
+{{ toYaml .Values.globalAnnotations | indent 4 }}
+  {{- end }}
 spec:
   hard:
     {{- range $key, $val := .Values.isolation.resourceQuota.quota }}

charts/k0s/templates/secret.yaml

@@ -8,6 +8,10 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  {{- if .Values.globalAnnotations}}
+  annotations:
+{{ toYaml .Values.globalAnnotations | indent 4 }}    
+  {{- end }}
 type: Opaque
 stringData:
   {{- if .Values.serviceCIDR }}

charts/k0s/templates/serviceaccount.yaml

@@ -9,6 +9,10 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  {{- if .Values.globalAnnotations }}
+  annotations:
+{{ toYaml .Values.globalAnnotations | indent 4 }}
+  {{- end }}
 {{- if .Values.serviceAccount.imagePullSecrets }}
 imagePullSecrets:
 {{ toYaml .Values.serviceAccount.imagePullSecrets | indent 2 }}

charts/k0s/templates/statefulset.yaml

@@ -11,9 +11,10 @@ metadata:
 {{- if .Values.labels }}
 {{ toYaml .Values.labels | indent 4 }}
 {{- end }}
-  {{- if .Values.annotations }}
+{{- $annotations := merge .Values.annotations .Values.globalAnnotations }}
+  {{- if $annotations }}
   annotations:
-{{ toYaml .Values.annotations | indent 4 }}
+{{ toYaml $annotations | indent 4 }}
   {{- end }}
 spec:
   serviceName: {{ .Release.Name }}-headless

charts/k0s/templates/workloadserviceaccount.yaml

@@ -8,6 +8,10 @@ metadata:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
+  {{- if .Values.globalAnnotations }}
+  annotations:
+{{ toYaml .Values.globalAnnotations | indent 4 }}
+  {{- end }}
 {{- if .Values.serviceAccount.imagePullSecrets }}
 imagePullSecrets:
 {{ toYaml .Values.serviceAccount.imagePullSecrets | indent 2 }}

charts/k8s/templates/controller-deployment.yaml

@@ -12,9 +12,10 @@ metadata:
 {{- if .Values.controller.labels }}
 {{ toYaml .Values.controller.labels | indent 4 }}
 {{- end }}
-  {{- if .Values.controller.annotations }}
+  {{- $annotations := merge .Values.globalAnnotations .Values.controller.annotations }}
+  {{- if $annotations }}
   annotations:
-{{ toYaml .Values.controller.annotations | indent 4 }}
+{{ toYaml $annotations | indent 4 }}
   {{- end }}
 spec:
   replicas: {{ .Values.controller.replicas }}

charts/k8s/templates/coredns.yaml

@@ -4,6 +4,10 @@ kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-coredns
   namespace: {{ .Release.Namespace }}
+  {{- if .Values.globalAnnotations }}
+  annotations:
+{{ toYaml .Values.globalAnnotations | indent 4 }}
+  {{- end }}
 data:
 {{- if .Values.coredns.manifests }}
   coredns.yaml: |-

charts/k8s/templates/daemonset-hostpath-mapper.yaml

@@ -17,9 +17,10 @@ metadata:
 {{- if .Values.labels }}
 {{ toYaml .Values.labels | indent 4 }}
 {{- end }}
-  {{- if .Values.annotations }}
+  {{- $annotations := merge .Values.globalAnnotations .Values.annotations }}
+  {{- if $annotations }}
   annotations:
-{{ toYaml .Values.annotations | indent 4 }}
+{{ toYaml $annotations | indent 4 }}
   {{- end }}
 spec:
   {{- if .Values.hostpathMapper.dev }}

charts/k8s/templates/etcd-statefulset.yaml

@@ -12,9 +12,10 @@ metadata:
 {{- if .Values.etcd.labels }}
 {{ toYaml .Values.etcd.labels | indent 4 }}
 {{- end }}
-  {{- if .Values.etcd.annotations }}
+  {{- $annotations := merge .Values.globalAnnotations .Values.etcd.annotations }}
+  {{- if $annotations }}
   annotations:
-{{ toYaml .Values.etcd.annotations | indent 4 }}
+{{ toYaml $annotations | indent 4 }}
   {{- end }}
 spec:
   serviceName: {{ .Release.Name }}-etcd-headless

charts/k8s/templates/ingress.yaml

@@ -2,9 +2,10 @@
 apiVersion: {{ .Values.ingress.apiVersion }}
 kind: Ingress
 metadata:
-  {{- if .Values.ingress.annotations }}
+  {{- $annotations := merge .Values.ingress.annotations .Values.globalAnnotations }}
+  {{- if $annotations }}
   annotations:
-  {{- toYaml .Values.ingress.annotations | nindent 4 }}
+  {{ toYaml $annotations | nindent 4 }}
   {{- end }}
   name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}
@@ -23,4 +24,4 @@ spec:
                   name: https
             path: /
             pathType: {{ .Values.ingress.pathType }}
-{{- end }}
+{{- end }}