Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

[apm-server] fix podLabels #1521

Merged
merged 2 commits into from
Feb 2, 2022
Merged

[apm-server] fix podLabels #1521

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
989045b
[APM] add podLabels
ebuildy Dec 25, 2021
49179ca
format with black
jmlrt Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions apm-server/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion apm-server/tests/apmserver_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down