feat(metricbeat): add support for annotations in daemonset and deploy…

…ment

PR for elastic#684

metricbeat/templates/daemonset.yaml

@@ -11,6 +11,12 @@ metadata:
     {{- range $key, $value := .Values.labels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
+  {{- if .Values.daemonset.annotations}}
+  annotations:
+    {{- range $key, $value := .Values.daemonset.annotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- end }}
 spec:
   selector:
     matchLabels:

metricbeat/templates/deployment.yaml

@@ -8,6 +8,12 @@ metadata:
     chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
     heritage: '{{ .Release.Service }}'
     release: '{{ .Release.Name }}'
+  {{- if .Values.deployment.annotations}}
+  annotations:
+    {{- range $key, $value := .Values.deployment.annotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+  {{- end }}
 spec:
   replicas: {{ .Values.replicas }}
   selector:

metricbeat/tests/metricbeat_test.py

@@ -1123,3 +1123,25 @@ def test_setting_fullnameOverride():
             "type": "DirectoryOrCreate",
         },
     } in volumes
+
+
+def test_adding_annotations():
+    config = """
+daemonset:
+    annotations:
+        foo: "bar"
+"""
+    r = helm_template(config)
+    assert "foo" in r["daemonset"][name]["metadata"]["annotations"]
+    assert r["daemonset"][name]["metadata"]["annotations"]["foo"] == "bar"
+    assert "annotations" not in r["deployment"][name + "-metrics"]["metadata"]
+    config = """
+deployment:
+    annotations:
+        grault: "waldo"
+"""
+    r = helm_template(config)
+    assert "grault" in r["deployment"][name + "-metrics"]["metadata"]["annotations"]
+    assert r["deployment"][name + "-metrics"]["metadata"]["annotations"]["grault"] == "waldo"
+    assert "annotations" not in r["daemonset"][name]["metadata"]
+

metricbeat/values.yaml

@@ -1,6 +1,7 @@
 ---
-
 daemonset:
+  # Annotations to apply to the daemonset
+  annotations: {}
   affinity: {}
   # Extra environment variables for Metricbeat container.
   envFrom: []
@@ -91,6 +92,8 @@ daemonset:
   tolerations: []
 
 deployment:
+  # Annotations to apply to the deployment
+  annotations: {}
   affinity: {}
   # Extra environment variables for Metricbeat container.
   envFrom: []
@@ -196,30 +199,30 @@ labels: {}
 managedServiceAccount: true
 
 clusterRoleRules:
-- apiGroups: [""]
-  resources:
-  - nodes
-  - namespaces
-  - events
-  - pods
-  verbs: ["get", "list", "watch"]
-- apiGroups: ["extensions"]
-  resources:
-  - replicasets
-  verbs: ["get", "list", "watch"]
-- apiGroups: ["apps"]
-  resources:
-  - statefulsets
-  - deployments
-  - replicasets
-  verbs: ["get", "list", "watch"]
-- apiGroups: [""]
-  resources:
-  - nodes/stats
-  verbs: ["get"]
+  - apiGroups: [""]
+    resources:
+      - nodes
+      - namespaces
+      - events
+      - pods
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["extensions"]
+    resources:
+      - replicasets
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["apps"]
+    resources:
+      - statefulsets
+      - deployments
+      - replicasets
+    verbs: ["get", "list", "watch"]
+  - apiGroups: [""]
+    resources:
+      - nodes/stats
+    verbs: ["get"]
 
 podAnnotations: {}
-  # iam.amazonaws.com/role: es-cluster
+# iam.amazonaws.com/role: es-cluster
 
 # Custom service account override that the pod will use
 serviceAccount: ""