Skip to content

Conversation

@dimberman
Copy link
Contributor

This PR works, but we need to figure out how to modify the official airflow docker image to match the one provided here.

@dimberman dimberman requested review from ashb, schnie and sjmiller609 and removed request for schnie April 7, 2020 19:13
@dimberman dimberman mentioned this pull request Apr 10, 2020
5 tasks
@dimberman dimberman force-pushed the airflow-2.0-compliance branch from 71610ee to 1d39160 Compare April 14, 2020 15:43
@dimberman dimberman changed the title [WIP] compliant with airflow 2.0 Get airflow to work with official docker image Apr 14, 2020
@dimberman dimberman marked this pull request as ready for review April 14, 2020 19:38
@dimberman
Copy link
Contributor Author

@schnie I'm still waiting on apache/airflow#8219 before I can use the actual official image, but we should start the review process now :)

@dimberman
Copy link
Contributor Author

@schnie @ashb @kaxil while I wait for travis to build my fix for the docker image (again >:() Can I get a review on this? Wanna make sure I'm good style-wise.

Comment on lines +41 to +43
- "users"
- "create"
- "--role"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this commands will depend on the version (Master uses users create but 1.10.* uses create_user

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kaxil unfortunately to merge this to master we'll need to make it 2.0 compliant, and THEN make it 1.10 complaint AGAIN when we cherry-pick to the 1-10-test branch.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These args are fine on 1.10, it's just the new command names that are the issue.

I wonder if we should add the new commands to 1.10.11 -- it would make upgrading easier on people.

@dimberman dimberman force-pushed the airflow-2.0-compliance branch from ad135db to b62e0a9 Compare April 16, 2020 19:28
To merge our chart into the airflow repo, we need the ability to run
with an airflow 2.0 official image
@dimberman dimberman force-pushed the airflow-2.0-compliance branch from b62e0a9 to 36943a9 Compare April 16, 2020 19:30
Copy link
Contributor

@sjmiller609 sjmiller609 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to make sure that all supported AC versions will work with this chart, which I have validated is the case for airflow chart version 0.12 (latest patch verison). Here is an issue that summarizes my concern https://github.com/astronomer/issues/issues/1132

image: {{ template "airflow_image" . }}
imagePullPolicy: {{ .Values.images.airflow.pullPolicy }}
args: ["airflow-migration-spinner", "--timeout=60"]
args: ["db", "check-migrations", "--migration-wait-timeout", "60"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The airflow-chart needs to support all astronomer certified images. Do these modifications to args work with all published AC versions?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sjmiller609 there isn't any non horrible way we can create a chart that both works for 1.10 and 2.0. Maybe we need to fork this repo?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To merge into master it needs to work with master, then we can cherry-pick and fix it for the 1-10-test branch

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@schnie can you decide what to do for this one? The only item I wish to protect in this case is AC compatibility on the master and release branches of this repository.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm cool with us forking "astronomer/oss-airflow-chart" and then donating that. Would that work?

Copy link
Contributor

@sjmiller609 sjmiller609 Apr 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll let greg speak to what pattern he wants, I think a branch on this repo seems reasonable, the benefit as opposed to a fork being that CI will keep working without further modification to CI configuration.

my suggestion:

  • branch on this repo (checkout -b from master), add branch protection rules in admin settings of this repository
  • This PR into that branch
  • when it is donation-ready, then copy it into greg's personal fork of airflow
  • Commit to include all current authors of the airflow chart
  • PR to apache/airflow

It seems that this function is already taken care of internally
@danielhoherd
Copy link
Member

Closing stale PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants