-
Notifications
You must be signed in to change notification settings - Fork 15.1k
Add ability for Dataproc operator to create cluster in GKE cluster #22852
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
Conversation
fd3398c
to
7eb79f7
Compare
@@ -292,7 +292,9 @@ def create_cluster( | |||
region: str, | |||
project_id: str, | |||
cluster_name: str, | |||
cluster_config: Union[Dict, Cluster], | |||
cluster_config: Union[Dict, Cluster, None], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cluster_config: Union[Dict, Cluster, None], | |
cluster_config: Union[Dict, Cluster, None] = None, |
cluster_config: Union[Dict, Cluster], | ||
cluster_config: Union[Dict, Cluster, None], | ||
virtual_cluster_config: Optional[Dict] = None, | ||
run_in_gke_cluster: Optional[bool] = False, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
run_in_gke_cluster: Optional[bool] = False, |
cluster = ( | ||
{ | ||
"project_id": project_id, | ||
"cluster_name": cluster_name, | ||
"virtual_cluster_config": virtual_cluster_config, | ||
} | ||
if run_in_gke_cluster | ||
else { | ||
"project_id": project_id, | ||
"cluster_name": cluster_name, | ||
"config": cluster_config, | ||
"labels": labels, | ||
} | ||
) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cluster = ( | |
{ | |
"project_id": project_id, | |
"cluster_name": cluster_name, | |
"virtual_cluster_config": virtual_cluster_config, | |
} | |
if run_in_gke_cluster | |
else { | |
"project_id": project_id, | |
"cluster_name": cluster_name, | |
"config": cluster_config, | |
"labels": labels, | |
} | |
) | |
cluster = { | |
"project_id": project_id, | |
"cluster_name": cluster_name, | |
"virtual_cluster_config": virtual_cluster_config, | |
} | |
if virtual_cluster_config is not None: | |
cluster['virtual_cluster_config'] = virtual_cluster_config | |
if cluster_config is not None: | |
cluster['config'] = cluster_config |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks to this, we give full control over the parameters to the user.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have removed run_in_gke_cluster
flag from the code
894b036
to
a83eddd
Compare
Needs some fixes. |
583fe3a
to
060d548
Compare
060d548
to
3e658c7
Compare
@potiuk could you review this PR one more time? |
The PR most likely needs to run full matrix of tests because it modifies parts of the core of Airflow. However, committers might decide to merge it quickly and take the risk. If they don't merge it quickly - please rebase it to the latest main at your convenience, or amend the last commit of the PR, and push it with --force-with-lease. |
Create ability for Dataproc operator to create dataproc cluster in Google Kubernetes Engine cluster. Also in this PR was updated google-cloud-container library version and GKE operators code which uses this library.
Co-authored-by: Wojciech Januszek januszek@google.com
Co-authored-by: Lukasz Wyszomirski wyszomirski@google.com
Co-authored-by: Maksim Yermakou maksimy@google.com
^ 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.