From 260257998bbe8b0e282651bd5699250dd861d8b1 Mon Sep 17 00:00:00 2001 From: Leah Cole Date: Tue, 5 Apr 2022 10:04:35 -0400 Subject: [PATCH 1/2] Update Airflow 2 GKE sample to use regional clusters --- composer/workflows/gke_operator.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer/workflows/gke_operator.py b/composer/workflows/gke_operator.py index 7db6a5c184b..6fa07394cb6 100644 --- a/composer/workflows/gke_operator.py +++ b/composer/workflows/gke_operator.py @@ -40,7 +40,7 @@ # [START composer_gkeoperator_fullconfig] # TODO(developer): update with your values PROJECT_ID = "my-project-id" - CLUSTER_ZONE = "us-west1-a" + CLUSTER_REGION = "us-west1" CLUSTER_NAME = "example-cluster" # [END composer_gkeoperator_minconfig] # [END composer_gkeoperator_templateconfig] @@ -58,7 +58,7 @@ create_cluster = GKECreateClusterOperator( task_id="create_cluster", project_id=PROJECT_ID, - location=CLUSTER_ZONE, + location=CLUSTER_REGION, body=CLUSTER, ) # [END composer_gke_create_cluster] @@ -70,7 +70,7 @@ # Name of task you want to run, used to generate Pod ID. name="pod-ex-minimum", project_id=PROJECT_ID, - location=CLUSTER_ZONE, + location=CLUSTER_REGION, cluster_name=CLUSTER_NAME, # Entrypoint of the container, if not specified the Docker container's # entrypoint is used. The cmds parameter is templated. @@ -93,7 +93,7 @@ task_id="ex-kube-templates", name="ex-kube-templates", project_id=PROJECT_ID, - location=CLUSTER_ZONE, + location=CLUSTER_REGION, cluster_name=CLUSTER_NAME, namespace="default", image="bash", @@ -120,7 +120,7 @@ kubernetes_affinity_ex = GKEStartPodOperator( task_id="ex-pod-affinity", project_id=PROJECT_ID, - location=CLUSTER_ZONE, + location=CLUSTER_REGION, cluster_name=CLUSTER_NAME, name="ex-pod-affinity", namespace="default", @@ -170,7 +170,7 @@ task_id="ex-all-configs", name="full", project_id=PROJECT_ID, - location=CLUSTER_ZONE, + location=CLUSTER_REGION, cluster_name=CLUSTER_NAME, namespace="default", image="perl", @@ -228,7 +228,7 @@ task_id="delete_cluster", name=CLUSTER_NAME, project_id=PROJECT_ID, - location=CLUSTER_ZONE, + location=CLUSTER_REGION, ) # [END composer_gkeoperator_delete_cluster] From d9d8d45ff7b1cb563d349e29f74930a71950e01c Mon Sep 17 00:00:00 2001 From: Leah Cole Date: Tue, 5 Apr 2022 10:16:18 -0400 Subject: [PATCH 2/2] add commentabout cluster location --- composer/workflows/gke_operator.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/composer/workflows/gke_operator.py b/composer/workflows/gke_operator.py index 6fa07394cb6..da19728c3bf 100644 --- a/composer/workflows/gke_operator.py +++ b/composer/workflows/gke_operator.py @@ -40,6 +40,8 @@ # [START composer_gkeoperator_fullconfig] # TODO(developer): update with your values PROJECT_ID = "my-project-id" + # It is recommended to use regional clusters for increased reliability + # though passing a zone in the location parameter is also valid CLUSTER_REGION = "us-west1" CLUSTER_NAME = "example-cluster" # [END composer_gkeoperator_minconfig]