Skip to content

Conversation

@FloChehab
Copy link
Contributor

Hello,
A small follow up to #12010.

#12010 introduced
a small bug in the way annotations are handled for the
flower ingress.

A test have been added to prevent this from occuring againg.

Also more conditionals have been added to the
flower-ingress.yaml file to make it compatible with schema
validation.


^ 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.

@boring-cyborg boring-cyborg bot added the area:helm-chart Airflow Helm Chart label Jan 11, 2021
@FloChehab
Copy link
Contributor Author

Hello @mik-laj, here is a small bug fix for the PR we merged 2 days ago (#12010).

@mik-laj mik-laj requested a review from XD-DENG January 11, 2021 21:53
@github-actions github-actions bot added the okay to merge It's ok to merge this PR as it does not require more tests label Jan 11, 2021
@github-actions
Copy link

The PR is likely OK to be merged with just subset of tests for default Python and Database versions without running the full matrix of tests, because it does not modify the core of Airflow. If the committers decide that the full tests matrix is needed, they will add the label 'full tests needed'. Then you should rebase to the latest master or amend the last commit of the PR, and push it with --force-with-lease.

@github-actions
Copy link

The Workflow run is cancelling this PR. Building images for the PR has failed. Follow the the workflow link to check the reason.

@potiuk
Copy link
Member

potiuk commented Jan 12, 2021

Can you please rebase @FloChehab ? We have some serious CI slow-downs (we are working on it) but this leads to some master broken more often than we would like to have. Apologies. Rebasing should fix the problem.

@FloChehab FloChehab force-pushed the fix-flower-ingress-annotations branch from b665654 to 37cbc36 Compare January 12, 2021 12:39
@FloChehab
Copy link
Contributor Author

Can you please rebase @FloChehab ? We have some serious CI slow-downs (we are working on it) but this leads to some master broken more often than we would like to have. Apologies. Rebasing should fix the problem.

Done.

@FloChehab FloChehab force-pushed the fix-flower-ingress-annotations branch from 37cbc36 to 79a3032 Compare February 7, 2021 19:59
apache#12010 introduced
a small bug in the way annotations are handled for the
flower ingress.

A test have been added to prevent this from occuring againg.

Also more conditionnals have been added to the
flower-ingress.yaml file to make it compatible with schema
validation.
@FloChehab FloChehab force-pushed the fix-flower-ingress-annotations branch from 79a3032 to 6aa2db7 Compare February 8, 2021 12:32
@FloChehab
Copy link
Contributor Author

Hello @potiuk, I performed another rebase today, we should be good to merge!

@potiuk potiuk merged commit eb842f2 into apache:master Feb 9, 2021
@potiuk
Copy link
Member

potiuk commented Feb 9, 2021

Thanks!

@FloChehab FloChehab deleted the fix-flower-ingress-annotations branch February 9, 2021 07:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:helm-chart Airflow Helm Chart okay to merge It's ok to merge this PR as it does not require more tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants