Add ability for Dataproc operator to create cluster in GKE cluster #22852
Conversation
This file contains 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
boring-cyborg
bot
added
provider:cncf-kubernetes
MaksYermak
force-pushed
the
dataproc-gke-operators
branch
from
fd3398c
to
7eb79f7
Compare
mik-laj
reviewed
Apr 8, 2022
| @@ -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.
Suggested change
| cluster_config: Union[Dict, Cluster, None], | |
| cluster_config: Union[Dict, Cluster, None] = None, |
mik-laj
reviewed
Apr 8, 2022
| 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.
Suggested change
| run_in_gke_cluster: Optional[bool] = False, |
mik-laj
reviewed
Apr 8, 2022
Comment on lines
335
to
348
| 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.
Suggested change
| 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.
Thanks to this, we give full control over the parameters to the user.
There was a problem hiding this comment.
I have removed run_in_gke_cluster flag from the code
MaksYermak
force-pushed
the
dataproc-gke-operators
branch
2 times, most recently
from
894b036
to
a83eddd
Compare
|
Needs some fixes. |
MaksYermak
force-pushed
the
dataproc-gke-operators
branch
2 times, most recently
from
583fe3a
to
060d548
Compare
MaksYermak
force-pushed
the
dataproc-gke-operators
branch
from
060d548
to
3e658c7
Compare
|
@potiuk could you review this PR one more time? |
potiuk
approved these changes
Apr 25, 2022
github-actions
bot
added
the
full tests needed
|
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. |
ephraimbuddy
added
the
changelog:skip
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
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.