Skip to content

Add Labels to jobs created by cleanup pods #19225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kaxil merged 2 commits into from
Oct 26, 2021
Merged

Add Labels to jobs created by cleanup pods #19225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1de809c
Add Labels to cleanup pods
pgvishnuram Oct 26, 2021
23e9265
Update chart/tests/test_cleanup_pods.py
pgvishnuram Oct 26, 2021
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
7 changes: 7 additions & 0 deletions chart/templates/cleanup/cleanup-cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ spec:
backoffLimit: 1
template:
metadata:
labels:
tier: airflow
component: airflow-cleanup-pods
release: {{ .Release.Name }}
{{- with .Values.labels }}
{{ toYaml . | indent 12 }}
{{- end }}
annotations:
sidecar.istio.io/inject: "false"
spec:
Expand Down
16 changes: 16 additions & 0 deletions chart/tests/test_cleanup_pods.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,19 @@ def test_command_and_args_overrides_are_templated(self):
"spec.jobTemplate.spec.template.spec.containers[0].command", docs[0]
)
assert ["Helm"] == jmespath.search("spec.jobTemplate.spec.template.spec.containers[0].args", docs[0])

def test_should_set_labels_to_jobs_from_cronjob(self):
docs = render_chart(
values={
"cleanup": {"enabled": True},
"labels": {"project": "airflow"},
},
show_only=["templates/cleanup/cleanup-cronjob.yaml"],
)

assert {
"tier": "airflow",
"component": "airflow-cleanup-pods",
"release": "RELEASE-NAME",
"project": "airflow",
} == jmespath.search("spec.jobTemplate.spec.template.metadata.labels", docs[0])