Skip to content

Commit

Permalink
Possibility to set labels specific to the migrateDatabaseJob objects …
Browse files Browse the repository at this point in the history
…and pods (apache#37490)



---------

Co-authored-by: cyla <[email protected]>
  • Loading branch information
cylabr and cyla authored Feb 27, 2024
1 parent f001576 commit 0517204
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 4 deletions.
4 changes: 2 additions & 2 deletions chart/templates/jobs/migrate-database-job-serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ metadata:
release: {{ .Release.Name }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
heritage: {{ .Release.Service }}
{{- with .Values.labels }}
{{- toYaml . | nindent 4 }}
{{- if or (.Values.labels) (.Values.migrateDatabaseJob.labels) }}
{{- mustMerge .Values.migrateDatabaseJob.labels .Values.labels | toYaml | nindent 4 }}
{{- end }}
{{- with .Values.migrateDatabaseJob.serviceAccount.annotations }}
annotations: {{- toYaml . | nindent 4 }}
Expand Down
4 changes: 2 additions & 2 deletions chart/templates/jobs/migrate-database-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ spec:
tier: airflow
component: run-airflow-migrations
release: {{ .Release.Name }}
{{- with .Values.labels }}
{{- toYaml . | nindent 8 }}
{{- if or (.Values.labels) (.Values.migrateDatabaseJob.labels) }}
{{- mustMerge .Values.migrateDatabaseJob.labels .Values.labels | toYaml | nindent 8 }}
{{- end }}
{{- if or .Values.airflowPodAnnotations .Values.migrateDatabaseJob.annotations }}
annotations:
Expand Down
8 changes: 8 additions & 0 deletions chart/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -4005,6 +4005,14 @@
"type": "string"
}
},
"labels": {
"description": "Labels to add to the migrate database job objects and pods.",
"type": "object",
"default": {},
"additionalProperties": {
"type": "string"
}
},
"serviceAccount": {
"description": "Create ServiceAccount.",
"type": "object",
Expand Down
3 changes: 3 additions & 0 deletions chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1086,6 +1086,9 @@ migrateDatabaseJob:
# jobAnnotations are annotations on the database migration job
jobAnnotations: {}

# Labels specific to migrate database job objects and pods
labels: {}

# When not set, the values defined in the global securityContext will be used
securityContext: {}
# runAsUser: 50000
Expand Down
63 changes: 63 additions & 0 deletions helm_tests/airflow_aux/test_migrate_database_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,39 @@ def test_should_support_annotations(self):
assert "fiz" in job_annotations
assert "fuz" == job_annotations["fiz"]

def test_should_add_component_specific_labels(self):
docs = render_chart(
values={
"migrateDatabaseJob": {
"labels": {"test_label": "test_label_value"},
},
},
show_only=["templates/jobs/migrate-database-job.yaml"],
)
assert "test_label" in jmespath.search("spec.template.metadata.labels", docs[0])
assert jmespath.search("spec.template.metadata.labels", docs[0])["test_label"] == "test_label_value"

def test_should_merge_common_labels_and_component_specific_labels(self):
docs = render_chart(
values={
"labels": {"test_common_label": "test_common_label_value"},
"migrateDatabaseJob": {
"labels": {"test_specific_label": "test_specific_label_value"},
},
},
show_only=["templates/jobs/migrate-database-job.yaml"],
)
assert "test_common_label" in jmespath.search("spec.template.metadata.labels", docs[0])
assert (
jmespath.search("spec.template.metadata.labels", docs[0])["test_common_label"]
== "test_common_label_value"
)
assert "test_specific_label" in jmespath.search("spec.template.metadata.labels", docs[0])
assert (
jmespath.search("spec.template.metadata.labels", docs[0])["test_specific_label"]
== "test_specific_label_value"
)

def test_should_create_valid_affinity_tolerations_and_node_selector(self):
docs = render_chart(
values={
Expand Down Expand Up @@ -340,6 +373,36 @@ def test_airflow_local_settings(self):
class TestMigrateDatabaseJobServiceAccount:
"""Tests migrate database job service account."""

def test_should_add_component_specific_labels(self):
docs = render_chart(
values={
"migrateDatabaseJob": {
"labels": {"test_label": "test_label_value"},
},
},
show_only=["templates/jobs/migrate-database-job-serviceaccount.yaml"],
)

assert "test_label" in jmespath.search("metadata.labels", docs[0])
assert jmespath.search("metadata.labels", docs[0])["test_label"] == "test_label_value"

def test_should_merge_common_labels_and_component_specific_labels(self):
docs = render_chart(
values={
"labels": {"test_common_label": "test_common_label_value"},
"migrateDatabaseJob": {
"labels": {"test_specific_label": "test_specific_label_value"},
},
},
show_only=["templates/jobs/migrate-database-job-serviceaccount.yaml"],
)
assert "test_common_label" in jmespath.search("metadata.labels", docs[0])
assert jmespath.search("metadata.labels", docs[0])["test_common_label"] == "test_common_label_value"
assert "test_specific_label" in jmespath.search("metadata.labels", docs[0])
assert (
jmespath.search("metadata.labels", docs[0])["test_specific_label"] == "test_specific_label_value"
)

def test_default_automount_service_account_token(self):
docs = render_chart(
values={
Expand Down

0 comments on commit 0517204

Please sign in to comment.