Merge branch 'elastic:main' into main

elastic · Feb 8, 2022 · bb75c11 · bb75c11
2 parents 06dcbbd + 5b4f789
commit bb75c11
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/.backportrc.json b/.backportrc.json
@@ -1,16 +1,15 @@
 {
-  "upstream": "elastic/helm-charts",
+  "all": true,
+  "prFilter": "label:need-backport",
+  "sourcePRLabels": [
+    "backported"
+  ],
   "targetBranchChoices": [
     "6.8",
-    "7.16",
-    "7.x"
+    "7.17"
   ],
-  "all": true,
-  "prFilter": "label:need-backport",
   "targetPRLabels": [
     "backport"
   ],
-  "sourcePRLabels": [
-    "backported"
-  ]
+  "upstream": "elastic/helm-charts"
 }
diff --git 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
@@ -268,7 +268,9 @@ 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"
     )
 

diff --git a/elasticsearch/templates/poddisruptionbudget.yaml b/elasticsearch/templates/poddisruptionbudget.yaml
@@ -1,5 +1,5 @@
----
 {{- if .Values.maxUnavailable }}
+---
 apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:

diff --git a/elasticsearch/templates/service.yaml b/elasticsearch/templates/service.yaml
@@ -1,5 +1,5 @@
----
 {{- if .Values.service.enabled -}}
+---
 kind: Service
 apiVersion: v1
 metadata:

diff --git a/elasticsearch/templates/test/test-elasticsearch-health.yaml b/elasticsearch/templates/test/test-elasticsearch-health.yaml
@@ -1,5 +1,5 @@
----
 {{- if .Values.tests.enabled -}}
+---
 apiVersion: v1
 kind: Pod
 metadata: