Fix kubernetes engine system test (#18548)

deedmitrij · web-flow · commit 2fadf3c3cf6e · 2021-09-27T18:41:15.000+02:00
- Add 'in_cluster=False' argument to 'GKEStartPodOperator'
- Change order of activating service account and setting project
diff --git a/airflow/providers/google/cloud/example_dags/example_kubernetes_engine.py b/airflow/providers/google/cloud/example_dags/example_kubernetes_engine.py
@@ -61,6 +61,7 @@
         namespace="default",
         image="perl",
         name="test-pod",
+        in_cluster=False,
     )
 
     # [START howto_operator_gke_start_pod_xcom]
@@ -74,6 +75,7 @@
         image="alpine",
         cmds=["sh", "-c", 'mkdir -p /airflow/xcom/;echo \'[1,2,3,4]\' > /airflow/xcom/return.json'],
         name="test-pod-xcom",
+        in_cluster=False,
     )
     # [END howto_operator_gke_start_pod_xcom]
 
diff --git a/airflow/providers/google/common/hooks/base_google.py b/airflow/providers/google/common/hooks/base_google.py
@@ -493,9 +493,6 @@ def provide_authorized_gcloud(self):
             gcloud_config_tmp = exit_stack.enter_context(tempfile.TemporaryDirectory())
             exit_stack.enter_context(patch_environ({CLOUD_SDK_CONFIG_DIR: gcloud_config_tmp}))
 
-            if project_id:
-                # Don't display stdout/stderr for security reason
-                check_output(["gcloud", "config", "set", "core/project", project_id])
             if CREDENTIALS in os.environ:
                 # This solves most cases when we are logged in using the service key in Airflow.
                 # Don't display stdout/stderr for security reason
@@ -507,6 +504,9 @@ def provide_authorized_gcloud(self):
                         f"--key-file={os.environ[CREDENTIALS]}",
                     ]
                 )
+            if project_id:
+                # Don't display stdout/stderr for security reason
+                check_output(["gcloud", "config", "set", "core/project", project_id])
             elif os.path.exists(credentials_path):
                 # If we are logged in by `gcloud auth application-default` then we need to log in manually.
                 # This will make the `gcloud auth application-default` and `gcloud auth` credentials equals.

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@`
`61`	`61`	`namespace="default",`
`62`	`62`	`image="perl",`
`63`	`63`	`name="test-pod",`
	`64`	`+ in_cluster=False,`
`64`	`65`	`)`
`65`	`66`
`66`	`67`	`# [START howto_operator_gke_start_pod_xcom]`
`@@ -74,6 +75,7 @@`
`74`	`75`	`image="alpine",`
`75`	`76`	`cmds=["sh", "-c", 'mkdir -p /airflow/xcom/;echo \'[1,2,3,4]\' > /airflow/xcom/return.json'],`
`76`	`77`	`name="test-pod-xcom",`
	`78`	`+ in_cluster=False,`
`77`	`79`	`)`
`78`	`80`	`# [END howto_operator_gke_start_pod_xcom]`
`79`	`81`