Bugfix: Fix overriding pod_template_file in KubernetesExecutor
#15197
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This feature was added in apache#11784 but it was broken as it got `pod_template_override` from `executor_config` instead of `pod_template_file`.
kaxil
requested review from
ashb,
mik-laj,
turbaszek and
vikramkoka
as code owners
boring-cyborg
bot
added
provider:cncf-kubernetes
kaxil
commented
Apr 5, 2021
| @@ -125,7 +125,7 @@ name ``base`` and a second container containing your desired sidecar. | |||
| :end-before: [END task_with_sidecar] | |||
|
|
|||
| You can also create custom ``pod_template_file`` on a per-task basis so that you can recycle the same base values between multiple tasks. | |||
| This will replace the default ``pod_template_file`` named in the airflow.cfg and then override that template using the ``pod_override_spec``. | |||
There was a problem hiding this comment.
pod_override_spec never existed
XD-DENG
reviewed
Apr 5, 2021
| }, | ||
| ), | ||
| spec=k8s.V1PodSpec( | ||
| containers=mock.ANY, |
There was a problem hiding this comment.
Possible to make the assertion more granular? Container spec is worth testing carefully, e.g. the image used.
There was a problem hiding this comment.
I was in two minds with that -- I added it back in 855d401
| assert executor.task_queue.empty() | ||
|
|
||
| executor.execute_async( | ||
| key=('dag', 'task', datetime.utcnow(), 1), |
There was a problem hiding this comment.
May be redundant, but to be on more safe side, we may want to assert the execution date here as well, rather than just having mock.ANY.
We have have something like below here
execution_date = datetime.utcnow()
executor.execute_async(
key=('dag', 'task', execution_date, 1),
... ...Then in mock_run_pod_async.assert_called_once_with(), have
annotations={
'dag_id': 'dag',
'execution_date': execution_date.isoformat(),
... ...
}and
labels={
'airflow-worker': '5',
'airflow_version': mock.ANY,
'dag_id': 'dag',
'execution_date': pod_generator.datetime_to_label_safe_datestring(execution_date),
... ...
}
kaxil
commented
Apr 5, 2021
Comment on lines
+72
to
+73
| serviceAccountName: airflow-worker | ||
| serviceAccount: airflow-worker |
There was a problem hiding this comment.
This change was needed after Helm chart change: 23768f6
However since we were not using the pod_template_file in the test we didn't find that it was broken
…bernetesExecutor
ephraimbuddy
approved these changes
Apr 5, 2021
kaxil
added a commit
to astronomer/airflow
that referenced
this pull request
Apr 12, 2021
…che#15197) This feature was added in apache#11784 but it was broken as it got `pod_template_override` from `executor_config` instead of `pod_template_file`. closes apache#14199 (cherry picked from commit 5606137) (cherry picked from commit 091fae90a0a564e2da92ead7dd5be2c1e8b56301)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This feature was added in #11784 but
it was broken as it got
pod_template_overridefromexecutor_configinstead of
pod_template_file.closes #14199
^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.