You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by GitBox <gi...@apache.org> on 2021/02/05 07:38:35 UTC
[GitHub] [airflow] cris-b opened a new pull request #14090: Fix merging of secrets and configmaps
cris-b opened a new pull request #14090:
URL: https://github.com/apache/airflow/pull/14090
- https://github.com/apache/airflow/issues/13023
This fixes the merging of configmaps and secrets when both exist.
<!--
Thank you for contributing! Please make sure that your code changes
are covered with tests. And in case of new features or big changes
remember to adjust the documentation.
Feel free to ping committers for the review!
In case of existing issue, reference it using one of the following:
closes: #13023
How to write a good git commit message:
http://chris.beams.io/posts/git-commit/
-->
---
**^ Add meaningful description above**
Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/master/CONTRIBUTING.rst#pull-request-guidelines)** for more information.
In case of fundamental code change, Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvements+Proposals)) is needed.
In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
In case of backwards incompatible changes please leave a note in [UPDATING.md](https://github.com/apache/airflow/blob/master/UPDATING.md).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] cris-b commented on pull request #14090: Fix merging of secrets and configmaps
Posted by GitBox <gi...@apache.org>.
cris-b commented on pull request #14090:
URL: https://github.com/apache/airflow/pull/14090#issuecomment-784111007
@dimberman test is done, CI is failing on something seemingly unrelated.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] kaxil commented on a change in pull request #14090: Fix merging of secrets and configmaps
Posted by GitBox <gi...@apache.org>.
kaxil commented on a change in pull request #14090:
URL: https://github.com/apache/airflow/pull/14090#discussion_r570906769
##########
File path: airflow/kubernetes/pod_generator.py
##########
@@ -506,7 +506,7 @@ def reconcile_containers(base_containers,
'volume_mounts',
'mount_path')
client_container = extend_object_field(base_container, client_container, 'env')
- client_container = extend_object_field(base_container, client_container, 'env_from')
+ client_container = extend_object_field(base_container, client_container, 'env_from', None)
Review comment:
Looks good but can you add a test case please in https://github.com/apache/airflow/blob/v1-10-stable/tests/kubernetes/test_pod_generator.py?
Same as https://github.com/apache/airflow/blob/v1-10-stable/tests/kubernetes/test_pod_generator.py#L636-L696 probably
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] cris-b commented on pull request #14090: Fix merging of secrets and configmaps
Posted by GitBox <gi...@apache.org>.
cris-b commented on pull request #14090:
URL: https://github.com/apache/airflow/pull/14090#issuecomment-781681072
new test added now, apologies for the wait!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] kaxil merged pull request #14090: Fix merging of secrets and configmaps
Posted by GitBox <gi...@apache.org>.
kaxil merged pull request #14090:
URL: https://github.com/apache/airflow/pull/14090
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] dimberman commented on pull request #14090: Fix merging of secrets and configmaps
Posted by GitBox <gi...@apache.org>.
dimberman commented on pull request #14090:
URL: https://github.com/apache/airflow/pull/14090#issuecomment-774194005
Agreed once we have a test we can merge this
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] dimberman commented on pull request #14090: Fix merging of secrets and configmaps
Posted by GitBox <gi...@apache.org>.
dimberman commented on pull request #14090:
URL: https://github.com/apache/airflow/pull/14090#issuecomment-779440909
@cris-b will you have time to set up a test this week? glad to help if you if you need :).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [airflow] github-actions[bot] commented on pull request #14090: Fix merging of secrets and configmaps
Posted by GitBox <gi...@apache.org>.
github-actions[bot] commented on pull request #14090:
URL: https://github.com/apache/airflow/pull/14090#issuecomment-773944622
[The Workflow run](https://github.com/apache/airflow/actions/runs/539893935) is cancelling this PR. It has some failed jobs matching ^Pylint$,^Static checks,^Build docs$,^Spell check docs$,^Backport packages$,^Provider packages,^Checks: Helm tests$,^Test OpenAPI*.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org