From 989045b38681a295b2d85fd030baca5aafb6edd8 Mon Sep 17 00:00:00 2001
From: Thomas Decaux <ebuildy@gmail.com>
Date: Sat, 25 Dec 2021 14:59:51 +0100
Subject: [PATCH 1/2] [APM] add podLabels

---
 apm-server/templates/deployment.yaml | 3 +++
 apm-server/tests/apmserver_test.py   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apm-server/templates/deployment.yaml b/apm-server/templates/deployment.yaml
index fa87cfa5a..9ab2ef1f5 100644
--- a/apm-server/templates/deployment.yaml
+++ b/apm-server/templates/deployment.yaml
@@ -21,6 +21,9 @@ spec:
       labels:
         app: apm-server
         release: {{ .Release.Name | quote }}
+        {{- range $key, $value := .Values.labels }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
       annotations:
         {{- range $key, $value := .Values.podAnnotations }}
         {{ $key }}: {{ $value | quote }}
diff --git a/apm-server/tests/apmserver_test.py b/apm-server/tests/apmserver_test.py
index d60007f3e..790ff37d2 100644
--- a/apm-server/tests/apmserver_test.py
+++ b/apm-server/tests/apmserver_test.py
@@ -268,7 +268,7 @@ def test_adding_pod_labels():
 """
     r = helm_template(config)
     assert (
-        r["deployment"][name]["metadata"]["labels"]["app.kubernetes.io/name"]
+        r["deployment"][name]["spec"]["template"]["metadata"]["labels"]["app.kubernetes.io/name"]
         == "apm-server"
     )
 

From 49179ca12a457b6a3438344a13a2b52ef0177a07 Mon Sep 17 00:00:00 2001
From: jmlrt <8582351+jmlrt@users.noreply.github.com>
Date: Wed, 2 Feb 2022 16:30:48 +0100
Subject: [PATCH 2/2] format with black

---
 apm-server/tests/apmserver_test.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apm-server/tests/apmserver_test.py b/apm-server/tests/apmserver_test.py
index 790ff37d2..ce5e17aea 100644
--- a/apm-server/tests/apmserver_test.py
+++ b/apm-server/tests/apmserver_test.py
@@ -268,7 +268,9 @@ def test_adding_pod_labels():
 """
     r = helm_template(config)
     assert (
-        r["deployment"][name]["spec"]["template"]["metadata"]["labels"]["app.kubernetes.io/name"]
+        r["deployment"][name]["spec"]["template"]["metadata"]["labels"][
+            "app.kubernetes.io/name"
+        ]
         == "apm-server"
     )