Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: airflow.{fernetKey,webserverSecretKey} overshadow _CMD configs #508

Merged
merged 3 commits into from
Apr 1, 2022

Conversation

aodj
Copy link
Contributor

@aodj aodj commented Jan 20, 2022

What issues does your PR fix?

What does your PR do?

  • Only set AIRFLOW__CORE__FERNET_KEY and AIRFLOW__WEBSERVER__SECRET_KEY when the values of airflow.fernetKey and airflow.webserverSecretKey are non-empty.
    • Allows the use of the _CMD and _SECRET variables, which are currently overshadowed by their non-suffixed versions.

Checklist

For all Pull Requests

For releasing ONLY

aodj and others added 3 commits January 20, 2022 19:57
This allows the two alternate environment variables to be used for
setting the fernet and webserver secret keys. The priority support given
via the airflow.fernetKey and airflow.webserverSecretKey options
prevented the use of these since the variables being set have a higher
order of precedence when compared to the _CMD or _SECRET alternatives.

Signed-off-by: Alexander O'Donovan-Jones <alexodonovanjones@gmail.com>
Signed-off-by: Alexander O'Donovan-Jones <alexodonovanjones@gmail.com>
Signed-off-by: Mathew Wicks <thesuperzapper@users.noreply.github.com>
@thesuperzapper thesuperzapper added this to the airflow-8.6.0 milestone Feb 23, 2022
@thesuperzapper
Copy link
Member

@aodj thanks for this PR!

I have made some changes to your branch so it can be ready to merge in 8.6.0 of the chart.

@thesuperzapper thesuperzapper changed the title fix: allow the use of the _CMD or _SECRET env vars fix: prevent airflow.{fernetKey,webserverSecretKey} overriding _CMD and _SECRET Mar 22, 2022
@thesuperzapper thesuperzapper added the status/ready-to-merge status - this will be merged into next release label Mar 22, 2022
@thesuperzapper thesuperzapper changed the title fix: prevent airflow.{fernetKey,webserverSecretKey} overriding _CMD and _SECRET fix: airflow.fernetKey and airflow.webserverSecretKey overshadow _CMD configs Mar 22, 2022
@thesuperzapper thesuperzapper changed the title fix: airflow.fernetKey and airflow.webserverSecretKey overshadow _CMD configs fix: airflow.{fernetKey,webserverSecretKey} overshadow _CMD configs Mar 22, 2022
@thesuperzapper thesuperzapper merged commit c188e54 into airflow-helm:main Apr 1, 2022
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/ready-to-merge status - this will be merged into next release
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

airflow.fernetKey and airflow.webserverSecretKey overshadow _CMD configs
2 participants