Fix merging of secrets and configmaps#14090
Merged
kaxil merged 5 commits intoapache:v1-10-stablefrom Mar 9, 2021
Merged
Conversation
|
The Workflow run 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*. |
kaxil
reviewed
Feb 5, 2021
airflow/kubernetes/pod_generator.py
Outdated
Member
There was a problem hiding this 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
Contributor
|
Agreed once we have a test we can merge this |
Contributor
|
@cris-b will you have time to set up a test this week? glad to help if you if you need :). |
Contributor
Author
|
new test added now, apologies for the wait! |
Contributor
Author
|
@dimberman test is done, CI is failing on something seemingly unrelated. |
kaxil
approved these changes
Mar 9, 2021
9 tasks
linuxfft
added a commit
to linuxfft/airflow
that referenced
this pull request
Aug 13, 2021
Apache Airflow 1.10.15 - Fix `airflow db upgrade` to upgrade db as intended (apache#13267) - Moved boto3 limitation to snowflake (apache#13286) - `KubernetesExecutor` should accept images from `executor_config` (apache#13074) - Scheduler should acknowledge active runs properly (apache#13803) - Bugfix: Unable to import Airflow plugins on Python 3.8 (apache#12859) - Include `airflow/contrib/executors` in the dist package - Pin Click version for Python 2.7 users - Ensure all statsd timers use millisecond values. (apache#10633) - [`kubernetes_generate_dag_yaml`] - Fix dag yaml generate function (apache#13816) - Fix `airflow tasks clear` cli command wirh `--yes` (apache#14188) - Fix permission error on non-POSIX filesystem (apache#13121) (apache#14383) - Fixed deprecation message for "variables" command (apache#14457) - BugFix: fix the `delete_dag` function of json_client (apache#14441) - Fix merging of secrets and configmaps for `KubernetesExecutor` (apache#14090) - Fix webserver exiting when gunicorn master crashes (apache#13470) - Bump ini from 1.3.5 to 1.3.8 in `airflow/www_rbac` - Bump datatables.net from 1.10.21 to 1.10.23 in `airflow/www_rbac` - Webserver: Sanitize string passed to origin param (apache#14738) - Make `rbac_app`'s `db.session` use the same timezone with `@provide_session` (apache#14025) - Adds airflow as viable docker command in official image (apache#12878) - `StreamLogWriter`: Provide (no-op) close method (apache#10885) - Add 'airflow variables list' command for 1.10.x transition version (apache#14462) - Update URL for Airflow docs (apache#13561) - Clarifies version args for installing 1.10 in Docker (apache#12875)
linuxfft
added a commit
to linuxfft/airflow
that referenced
this pull request
Aug 13, 2021
Apache Airflow 1.10.15 - Fix `airflow db upgrade` to upgrade db as intended (apache#13267) - Moved boto3 limitation to snowflake (apache#13286) - `KubernetesExecutor` should accept images from `executor_config` (apache#13074) - Scheduler should acknowledge active runs properly (apache#13803) - Bugfix: Unable to import Airflow plugins on Python 3.8 (apache#12859) - Include `airflow/contrib/executors` in the dist package - Pin Click version for Python 2.7 users - Ensure all statsd timers use millisecond values. (apache#10633) - [`kubernetes_generate_dag_yaml`] - Fix dag yaml generate function (apache#13816) - Fix `airflow tasks clear` cli command wirh `--yes` (apache#14188) - Fix permission error on non-POSIX filesystem (apache#13121) (apache#14383) - Fixed deprecation message for "variables" command (apache#14457) - BugFix: fix the `delete_dag` function of json_client (apache#14441) - Fix merging of secrets and configmaps for `KubernetesExecutor` (apache#14090) - Fix webserver exiting when gunicorn master crashes (apache#13470) - Bump ini from 1.3.5 to 1.3.8 in `airflow/www_rbac` - Bump datatables.net from 1.10.21 to 1.10.23 in `airflow/www_rbac` - Webserver: Sanitize string passed to origin param (apache#14738) - Make `rbac_app`'s `db.session` use the same timezone with `@provide_session` (apache#14025) - Adds airflow as viable docker command in official image (apache#12878) - `StreamLogWriter`: Provide (no-op) close method (apache#10885) - Add 'airflow variables list' command for 1.10.x transition version (apache#14462) - Update URL for Airflow docs (apache#13561) - Clarifies version args for installing 1.10 in Docker (apache#12875)
andrewdanks
added a commit
to Affirm/airflow
that referenced
this pull request
Mar 18, 2022
Apache Airflow 1.10.15 - Fix `airflow db upgrade` to upgrade db as intended (apache#13267) - Moved boto3 limitation to snowflake (apache#13286) - `KubernetesExecutor` should accept images from `executor_config` (apache#13074) - Scheduler should acknowledge active runs properly (apache#13803) - Bugfix: Unable to import Airflow plugins on Python 3.8 (apache#12859) - Include `airflow/contrib/executors` in the dist package - Pin Click version for Python 2.7 users - Ensure all statsd timers use millisecond values. (apache#10633) - [`kubernetes_generate_dag_yaml`] - Fix dag yaml generate function (apache#13816) - Fix `airflow tasks clear` cli command wirh `--yes` (apache#14188) - Fix permission error on non-POSIX filesystem (apache#13121) (apache#14383) - Fixed deprecation message for "variables" command (apache#14457) - BugFix: fix the `delete_dag` function of json_client (apache#14441) - Fix merging of secrets and configmaps for `KubernetesExecutor` (apache#14090) - Fix webserver exiting when gunicorn master crashes (apache#13470) - Bump ini from 1.3.5 to 1.3.8 in `airflow/www_rbac` - Bump datatables.net from 1.10.21 to 1.10.23 in `airflow/www_rbac` - Webserver: Sanitize string passed to origin param (apache#14738) - Make `rbac_app`'s `db.session` use the same timezone with `@provide_session` (apache#14025) - Adds airflow as viable docker command in official image (apache#12878) - `StreamLogWriter`: Provide (no-op) close method (apache#10885) - Add 'airflow variables list' command for 1.10.x transition version (apache#14462) - Update URL for Airflow docs (apache#13561) - Clarifies version args for installing 1.10 in Docker (apache#12875)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 fixes the merging of configmaps and secrets when both exist.
^ 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.